All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types
@ 2019-12-09 21:10 Leo Liu
  2019-12-09 21:10 ` [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init Leo Liu
  2019-12-09 21:24 ` [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types James Zhu
  0 siblings, 2 replies; 5+ messages in thread
From: Leo Liu @ 2019-12-09 21:10 UTC (permalink / raw)
  To: amd-gfx; +Cc: Leo Liu

The JPEG irq type has been moved to its own structure

Signed-off-by: Leo Liu <leo.liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
index 5649190cb629..d76ece38c97b 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
@@ -1788,7 +1788,7 @@ static const struct amdgpu_irq_src_funcs vcn_v2_0_irq_funcs = {
 
 static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev)
 {
-	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 2;
+	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 1;
 	adev->vcn.inst->irq.funcs = &vcn_v2_0_irq_funcs;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 42d6b9f0553b..f67fca38c1a9 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -1138,7 +1138,7 @@ static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev)
 	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
 		if (adev->vcn.harvest_config & (1 << i))
 			continue;
-		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 2;
+		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 1;
 		adev->vcn.inst[i].irq.funcs = &vcn_v2_5_irq_funcs;
 	}
 }
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init
  2019-12-09 21:10 [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types Leo Liu
@ 2019-12-09 21:10 ` Leo Liu
  2019-12-09 21:45   ` Deucher, Alexander
  2019-12-09 21:24 ` [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types James Zhu
  1 sibling, 1 reply; 5+ messages in thread
From: Leo Liu @ 2019-12-09 21:10 UTC (permalink / raw)
  To: amd-gfx; +Cc: Leo Liu

Fixes: 0388aee76("drm/amdgpu: use the JPEG structure for
general driver support")

Signed-off-by: Leo Liu <leo.liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index a0d3d7b756eb..db4b6283c28c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -170,7 +170,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
 			break;
 		case AMDGPU_HW_IP_VCN_JPEG:
 			for (j = 0; j < adev->jpeg.num_jpeg_inst; ++j) {
-				if (adev->vcn.harvest_config & (1 << j))
+				if (adev->jpeg.harvest_config & (1 << j))
 					continue;
 				rings[num_rings++] = &adev->jpeg.inst[j].ring_dec;
 			}
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types
  2019-12-09 21:10 [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types Leo Liu
  2019-12-09 21:10 ` [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init Leo Liu
@ 2019-12-09 21:24 ` James Zhu
  1 sibling, 0 replies; 5+ messages in thread
From: James Zhu @ 2019-12-09 21:24 UTC (permalink / raw)
  To: amd-gfx

Reviewed-by: James Zhu <James.Zhu@amd.com> for the series

On 2019-12-09 4:10 p.m., Leo Liu wrote:
> The JPEG irq type has been moved to its own structure
>
> Signed-off-by: Leo Liu <leo.liu@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index 5649190cb629..d76ece38c97b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -1788,7 +1788,7 @@ static const struct amdgpu_irq_src_funcs vcn_v2_0_irq_funcs = {
>   
>   static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev)
>   {
> -	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 2;
> +	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 1;
>   	adev->vcn.inst->irq.funcs = &vcn_v2_0_irq_funcs;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index 42d6b9f0553b..f67fca38c1a9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -1138,7 +1138,7 @@ static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev)
>   	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>   		if (adev->vcn.harvest_config & (1 << i))
>   			continue;
> -		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 2;
> +		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 1;
>   		adev->vcn.inst[i].irq.funcs = &vcn_v2_5_irq_funcs;
>   	}
>   }
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init
  2019-12-09 21:10 ` [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init Leo Liu
@ 2019-12-09 21:45   ` Deucher, Alexander
  2019-12-09 22:09     ` Deucher, Alexander
  0 siblings, 1 reply; 5+ messages in thread
From: Deucher, Alexander @ 2019-12-09 21:45 UTC (permalink / raw)
  To: Liu, Leo, amd-gfx


[-- Attachment #1.1: Type: text/plain, Size: 1918 bytes --]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Leo Liu <leo.liu@amd.com>
Sent: Monday, December 9, 2019 4:10 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Liu, Leo <Leo.Liu@amd.com>
Subject: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init

Fixes: 0388aee76("drm/amdgpu: use the JPEG structure for
general driver support")

Signed-off-by: Leo Liu <leo.liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index a0d3d7b756eb..db4b6283c28c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -170,7 +170,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
                         break;
                 case AMDGPU_HW_IP_VCN_JPEG:
                         for (j = 0; j < adev->jpeg.num_jpeg_inst; ++j) {
-                               if (adev->vcn.harvest_config & (1 << j))
+                               if (adev->jpeg.harvest_config & (1 << j))
                                         continue;
                                 rings[num_rings++] = &adev->jpeg.inst[j].ring_dec;
                         }
--
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7Ca5db83292d3844d8955908d77cec5306%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637115227328960060&amp;sdata=mWsj0v7AxwKQVL1FzSn%2F6QhASdd4NxUQmMl9pCX7vTQ%3D&amp;reserved=0

[-- Attachment #1.2: Type: text/html, Size: 4467 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init
  2019-12-09 21:45   ` Deucher, Alexander
@ 2019-12-09 22:09     ` Deucher, Alexander
  0 siblings, 0 replies; 5+ messages in thread
From: Deucher, Alexander @ 2019-12-09 22:09 UTC (permalink / raw)
  To: Liu, Leo, amd-gfx


[-- Attachment #1.1: Type: text/plain, Size: 2655 bytes --]

forgot to add RB for the series.

Alex
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Deucher, Alexander <Alexander.Deucher@amd.com>
Sent: Monday, December 9, 2019 4:45 PM
To: Liu, Leo <Leo.Liu@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init


[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Leo Liu <leo.liu@amd.com>
Sent: Monday, December 9, 2019 4:10 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Liu, Leo <Leo.Liu@amd.com>
Subject: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init

Fixes: 0388aee76("drm/amdgpu: use the JPEG structure for
general driver support")

Signed-off-by: Leo Liu <leo.liu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index a0d3d7b756eb..db4b6283c28c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -170,7 +170,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
                         break;
                 case AMDGPU_HW_IP_VCN_JPEG:
                         for (j = 0; j < adev->jpeg.num_jpeg_inst; ++j) {
-                               if (adev->vcn.harvest_config & (1 << j))
+                               if (adev->jpeg.harvest_config & (1 << j))
                                         continue;
                                 rings[num_rings++] = &adev->jpeg.inst[j].ring_dec;
                         }
--
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7Ca5db83292d3844d8955908d77cec5306%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637115227328960060&amp;sdata=mWsj0v7AxwKQVL1FzSn%2F6QhASdd4NxUQmMl9pCX7vTQ%3D&amp;reserved=0<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C454ec893912b4159401508d77cf12e32%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637115247993380490&sdata=rMdk0451tQlGBMxu%2FGtjgPvvkmXZIdWzP9ziaXoxHJk%3D&reserved=0>

[-- Attachment #1.2: Type: text/html, Size: 5851 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-09 22:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-09 21:10 [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types Leo Liu
2019-12-09 21:10 ` [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init Leo Liu
2019-12-09 21:45   ` Deucher, Alexander
2019-12-09 22:09     ` Deucher, Alexander
2019-12-09 21:24 ` [PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types James Zhu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.