Skip to contentSkip to conversation

drm/amdgpu: Fix code with incorrect enum type

PATCH In review Grigory Vasilyev 3 participants 4 messages Apr 6, 2022 – Apr 7, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Fix code with incorrect enum type

Instead of the 'amdgpu_ring_priority_level' type, the 'amdgpu_gfx_pipe_priority' type was used, which is an error when setting ring priority.
This is a minor error, but may cause problems in the future.

Instead of AMDGPU_RING_PRIO_2 = 2, we can use AMDGPU_RING_PRIO_MAX = 3, but AMDGPU_RING_PRIO_2 = 2 is used for compatibility with AMDGPU_GFX_PIPE_PRIO_HIGH = 2, and not change the behavior of the code.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -1
index 5554084ec1f1..9bc26395f833 100644
@@ -1929,7 +1929,7 @@ static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
 		+ ring->pipe;
 
 	hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
-			AMDGPU_GFX_PIPE_PRIO_HIGH : AMDGPU_RING_PRIO_DEFAULT;
+			AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;
 	/* type-2 packets are deprecated on MEC, use type-3 instead */
 	r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
 			     hw_prio, NULL);
Signature · 1 line
2.35.1
#1 lore raw

Am 06.04.22 um 18:50 schrieb Grigory Vasilyev:

Quoted 11 lines

Instead of the 'amdgpu_ring_priority_level' type, the 'amdgpu_gfx_pipe_priority' type was used, which is an error when setting ring priority.
This is a minor error, but may cause problems in the future.

Instead of AMDGPU_RING_PRIO_2 = 2, we can use AMDGPU_RING_PRIO_MAX = 3, but AMDGPU_RING_PRIO_2 = 2 is used for compatibility with AMDGPU_GFX_PIPE_PRIO_HIGH = 2, and not change the behavior of the code.

Good catch, Acked-by: Christian König <[email protected]>

Quoted 17 lines
---
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -1
index 5554084ec1f1..9bc26395f833 100644
@@ -1929,7 +1929,7 @@ static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
  		+ ring->pipe;
 
  	hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
-			AMDGPU_GFX_PIPE_PRIO_HIGH : AMDGPU_RING_PRIO_DEFAULT;
+			AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;
  	/* type-2 packets are deprecated on MEC, use type-3 instead */
  	r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
  			     hw_prio, NULL);
#2 lore raw
Quoted 27 lines · Christian König

Am 06.04.22 um 18:50 schrieb Grigory Vasilyev:

Quoted 11 lines

Instead of the 'amdgpu_ring_priority_level' type, the 'amdgpu_gfx_pipe_priority' type was used, which is an error when setting ring priority.
This is a minor error, but may cause problems in the future.

Instead of AMDGPU_RING_PRIO_2 = 2, we can use AMDGPU_RING_PRIO_MAX = 3, but AMDGPU_RING_PRIO_2 = 2 is used for compatibility with AMDGPU_GFX_PIPE_PRIO_HIGH = 2, and not change the behavior of the code.

Good catch, Acked-by: Christian König <[email protected]>

Quoted 11 lines
---
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
index 5554084ec1f1..9bc26395f833 100644
@@ -1929,7 +1929,7 @@ static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
              + ring->pipe;
 
Quoted 3 lines

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, · line 1932

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -1
      hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
-                     AMDGPU_GFX_PIPE_PRIO_HIGH : AMDGPU_RING_PRIO_DEFAULT;
+                     AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;

gfx_v8_0.c, gfx_v9_0.c, gfx_v10_0.c all do this. Care to fix them all up?

Alex

Quoted 4 lines
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
      /* type-2 packets are deprecated on MEC, use type-3 instead */
      r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
                           hw_prio, NULL);
#3 lore raw

Alex Deucher I will do it. Initially, I came across an error that different enum types are used.
Now I looked at the files, and indeed AMDGPU_GFX_PIPE_PRIO_* is used instead of AMDGPU_RING_PRIO_*.
The question remains whether it is worth increasing the priority to AMDGPU_RING_PRIO_MAX=3 ?

Regards, Grigory.

чт, 7 апр. 2022 г. в 20:46, Alex Deucher <[email protected]>:

Quoted 42 lines
Quoted 27 lines · Christian König

Am 06.04.22 um 18:50 schrieb Grigory Vasilyev:

Quoted 11 lines

Instead of the 'amdgpu_ring_priority_level' type, the 'amdgpu_gfx_pipe_priority' type was used, which is an error when setting ring priority.
This is a minor error, but may cause problems in the future.

Instead of AMDGPU_RING_PRIO_2 = 2, we can use AMDGPU_RING_PRIO_MAX = 3, but AMDGPU_RING_PRIO_2 = 2 is used for compatibility with AMDGPU_GFX_PIPE_PRIO_HIGH = 2, and not change the behavior of the code.

Good catch, Acked-by: Christian König <[email protected]>

Quoted 11 lines
---
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
index 5554084ec1f1..9bc26395f833 100644
@@ -1929,7 +1929,7 @@ static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
              + ring->pipe;
 
Quoted 3 lines

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static int gfx_v8_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, · line 1932

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -1
      hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
-                     AMDGPU_GFX_PIPE_PRIO_HIGH : AMDGPU_RING_PRIO_DEFAULT;
+                     AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;

gfx_v8_0.c, gfx_v9_0.c, gfx_v10_0.c all do this. Care to fix them all up?

Alex

Quoted 4 lines
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -0
      /* type-2 packets are deprecated on MEC, use type-3 instead */
      r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
                           hw_prio, NULL);