]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: gfx 12.1 cleanups
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 4 Mar 2026 15:06:04 +0000 (10:06 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 6 Mar 2026 21:31:47 +0000 (16:31 -0500)
Remove some remnants from when the code was forked
from gfx 12.0.

Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c

index 557d15b90ad27497e4b6401f86d79e310c755f40..3fd489ea0b79da47e74fa8c7202a68d35c6b6e3a 100644 (file)
@@ -3630,12 +3630,6 @@ static int gfx_v12_1_eop_irq(struct amdgpu_device *adev,
                        return -EINVAL;
 
                switch (me_id) {
-               case 0:
-                       if (pipe_id == 0)
-                               amdgpu_fence_process(&adev->gfx.gfx_ring[0]);
-                       else
-                               amdgpu_fence_process(&adev->gfx.gfx_ring[1]);
-                       break;
                case 1:
                case 2:
                        for (i = 0; i < adev->gfx.num_compute_rings; i++) {
@@ -3652,6 +3646,9 @@ static int gfx_v12_1_eop_irq(struct amdgpu_device *adev,
                                        amdgpu_fence_process(ring);
                        }
                        break;
+               default:
+                       dev_dbg(adev->dev, "Unexpected me %d in eop_irq\n", me_id);
+                       break;
                }
        }
 
@@ -3720,14 +3717,6 @@ static void gfx_v12_1_handle_priv_fault(struct amdgpu_device *adev,
                return;
 
        switch (me_id) {
-       case 0:
-               for (i = 0; i < adev->gfx.num_gfx_rings; i++) {
-                       ring = &adev->gfx.gfx_ring[i];
-                       /* we only enabled 1 gfx queue per pipe for now */
-                       if (ring->me == me_id && ring->pipe == pipe_id)
-                               drm_sched_fault(&ring->sched);
-               }
-               break;
        case 1:
        case 2:
                for (i = 0; i < adev->gfx.num_compute_rings; i++) {
@@ -3740,7 +3729,7 @@ static void gfx_v12_1_handle_priv_fault(struct amdgpu_device *adev,
                }
                break;
        default:
-               BUG();
+               dev_dbg(adev->dev, "Unexpected me %d in priv_fault\n", me_id);
                break;
        }
 }