]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: Use logical instance ID for SDMA v4_4_2 queue operations
authorJesse Zhang <jesse.zhang@amd.com>
Wed, 11 Jun 2025 07:07:11 +0000 (15:07 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 18 Jun 2025 17:11:15 +0000 (13:11 -0400)
Simplify SDMA v4_4_2 queue reset and stop operations by:
1. Removing GET_INST(SDMA0) conversion for ring->me
2. Using the logical instance ID (ring->me) directly
3. Maintaining consistent behavior with other SDMA queue operations

This change aligns with the existing queue handling logic where
ring->me already represents the correct instance identifier.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3bab282dfe25dff7a55add432f56898505a6cc6c)
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c

index 9c169112a5e7b8152c87ff439c98b9fb11bd2bbe..3de125062ee3eeafd40029d0681cfec8c3638cb9 100644 (file)
@@ -1670,7 +1670,7 @@ static bool sdma_v4_4_2_page_ring_is_guilty(struct amdgpu_ring *ring)
 static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
-       u32 id = GET_INST(SDMA0, ring->me);
+       u32 id = ring->me;
        int r;
 
        if (!(adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
@@ -1686,7 +1686,7 @@ static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
 static int sdma_v4_4_2_stop_queue(struct amdgpu_ring *ring)
 {
        struct amdgpu_device *adev = ring->adev;
-       u32 instance_id = GET_INST(SDMA0, ring->me);
+       u32 instance_id = ring->me;
        u32 inst_mask;
        uint64_t rptr;