Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 377e2759 authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

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: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb5c9ca5

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+0 −2
Original line number Diff line number Diff line
@@ -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,