drm/amdgpu:no need to involv HDP in KIQ

1,KIQ won't touch VRAM so no need to involv HDP flush/invalidate at all.
2,According to CP hw designer KIQ better not use any PM4 package lead to wait behave.

Signed-off-by: Monk Liu <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index ecef35a1fe331c99cfb31510bf924dff37a90da4..ba8b8ae6234f583bef4ec5030d7888fbf6cfabb2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -122,9 +122,7 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 
        mutex_lock(&adev->virt.lock_kiq);
        amdgpu_ring_alloc(ring, 32);
-       amdgpu_ring_emit_hdp_flush(ring);
        amdgpu_ring_emit_rreg(ring, reg);
-       amdgpu_ring_emit_hdp_invalidate(ring);
        amdgpu_fence_emit(ring, &f);
        amdgpu_ring_commit(ring);
        mutex_unlock(&adev->virt.lock_kiq);
@@ -150,9 +148,7 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
 
        mutex_lock(&adev->virt.lock_kiq);
        amdgpu_ring_alloc(ring, 32);
-       amdgpu_ring_emit_hdp_flush(ring);
        amdgpu_ring_emit_wreg(ring, reg, v);
-       amdgpu_ring_emit_hdp_invalidate(ring);
        amdgpu_fence_emit(ring, &f);
        amdgpu_ring_commit(ring);
        mutex_unlock(&adev->virt.lock_kiq);

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index cf2a4d76afbfda877a0138667e9d5e937180f89a..dad8a4cd1b375c9ae2d8d1ce80bc84f48fbdf293 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -7135,8 +7135,6 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_kiq = {
        .emit_ib_size = 4, /* gfx_v8_0_ring_emit_ib_compute */
        .emit_ib = gfx_v8_0_ring_emit_ib_compute,
        .emit_fence = gfx_v8_0_ring_emit_fence_kiq,
-       .emit_hdp_flush = gfx_v8_0_ring_emit_hdp_flush,
-       .emit_hdp_invalidate = gfx_v8_0_ring_emit_hdp_invalidate,
        .test_ring = gfx_v8_0_ring_test_ring,
        .test_ib = gfx_v8_0_ring_test_ib,
        .insert_nop = amdgpu_ring_insert_nop,

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index c386e8b8711f19368070c2176bfe2590f0b6f100..a447b70841c9cd9b6aa89180bec0f3ae6f210910 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -3542,8 +3542,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
        .emit_ib_size = 4, /* gfx_v9_0_ring_emit_ib_compute */
        .emit_ib = gfx_v9_0_ring_emit_ib_compute,
        .emit_fence = gfx_v9_0_ring_emit_fence_kiq,
-       .emit_hdp_flush = gfx_v9_0_ring_emit_hdp_flush,
-       .emit_hdp_invalidate = gfx_v9_0_ring_emit_hdp_invalidate,
        .test_ring = gfx_v9_0_ring_test_ring,
        .test_ib = gfx_v9_0_ring_test_ib,
        .insert_nop = amdgpu_ring_insert_nop,