I'm not sure if the order matters, but it seems like it makes
more sense to set this after the range is programmed.

Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index e363418..5cfcb1a 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4943,9 +4943,6 @@ static int gfx_v8_0_kiq_init_register(struct amdgpu_ring 
*ring)
        /* activate the queue */
        WREG32(mmCP_HQD_ACTIVE, mqd->cp_hqd_active);
 
-       if (ring->use_doorbell)
-               WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1);
-
        return 0;
 }
 
@@ -5067,6 +5064,7 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
                WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER,
                       AMDGPU_DOORBELL_MEC_RING7 << 2);
        }
+       WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1);
 
        r = gfx_v8_0_kiq_kcq_enable(adev);
        if (r)
-- 
2.5.5

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

Reply via email to