Skip to contentSkip to conversation

drm/amdgpu: fix VCN2.x number of irq types

PATCH In review Leo Liu 3 participants 5 messages Dec 9, 2019

Subsystems (2)
lore
Share & tools
lore

Leo Liu

author
#0 lore raw

PATCH 1/2 drm/amdgpu: fix VCN2.x number of irq types

The JPEG irq type has been moved to its own structure

---
 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(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -1
index 5649190cb629..d76ece38c97b 100644
@@ -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;
 }
 
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -1
index 42d6b9f0553b..f67fca38c1a9 100644
@@ -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;
 	}
 }
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#1 lore raw

PATCH 2/2 drm/amdgpu: fix JPEG instance checking when ctx init

Fixes 0388aee76("drm/amdgpu: use the JPEG structure for

general driver support")

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index a0d3d7b756eb..db4b6283c28c 100644
@@ -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;
 			}
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init

[AMD Official Use Only - Internal Distribution Only]

________________________________
From: amd-gfx <[email protected]> on behalf of Leo Liu <[email protected]>
Sent: Monday, December 9, 2019 4:10 PM
To: [email protected] <[email protected]>
Cc: Liu, Leo <[email protected]>
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")

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index a0d3d7b756eb..db4b6283c28c 100644
@@ -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
[email protected]
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

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

maintainer Reviewed-by
#3 lore raw

Re: [PATCH 2/2] drm/amdgpu: fix JPEG instance checking when ctx init

forgot to add RB for the series.

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

[AMD Official Use Only - Internal Distribution Only]

________________________________
From: amd-gfx <[email protected]> on behalf of Leo Liu <[email protected]>
Sent: Monday, December 9, 2019 4:10 PM
To: [email protected] <[email protected]>
Cc: Liu, Leo <[email protected]>
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")

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index a0d3d7b756eb..db4b6283c28c 100644
@@ -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
[email protected]
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>

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by on v1 1/2
#4 lore raw
In reply to Leo Liu
Quoted 26 lines · Leo Liu

The JPEG irq type has been moved to its own structure

---
  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(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -1
index 5649190cb629..d76ece38c97b 100644
@@ -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;
  }
 
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0 -0
index 42d6b9f0553b..f67fca38c1a9 100644

drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev) · line 1144

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -1
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx