1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index cec46ebae5f7..855b5272f4b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2366,14 +2366,14 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring)
 }
 
 /**
- * gfx_v7_0_hdp_flush_cp_ring_emit - emit an hdp flush on the cp
+ * gfx_v7_0_ring_emit_hdp - emit an hdp flush on the cp
  *
  * @adev: amdgpu_device pointer
  * @ridx: amdgpu ring index
  *
  * Emits an hdp flush on the cp.
  */
-static void gfx_v7_0_hdp_flush_cp_ring_emit(struct amdgpu_ring *ring)
+static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
 {
         u32 ref_and_mask;
 
@@ -2528,9 +2528,6 @@ static void gfx_v7_0_ring_emit_ib(struct amdgpu_ring *ring,
         if (ring->type == AMDGPU_RING_TYPE_COMPUTE)
                 control |= INDIRECT_BUFFER_VALID;
 
-        if (ib->flush_hdp_writefifo)
-                next_rptr += 7;
-
         if (ring->need_ctx_switch && ring->type == AMDGPU_RING_TYPE_GFX)
                 next_rptr += 2;
 
@@ -2541,9 +2538,6 @@ static void gfx_v7_0_ring_emit_ib(struct amdgpu_ring *ring,
         amdgpu_ring_write(ring, upper_32_bits(ring->next_rptr_gpu_addr) & 0xffffffff);
         amdgpu_ring_write(ring, next_rptr);
 
-        if (ib->flush_hdp_writefifo)
-                gfx_v7_0_hdp_flush_cp_ring_emit(ring);
-
         /* insert SWITCH_BUFFER packet before first IB in the ring frame */
         if (ring->need_ctx_switch && ring->type == AMDGPU_RING_TYPE_GFX) {
                 amdgpu_ring_write(ring, PACKET3(PACKET3_SWITCH_BUFFER, 0));
@@ -5522,6 +5516,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = {
         .emit_semaphore = gfx_v7_0_ring_emit_semaphore,
         .emit_vm_flush = gfx_v7_0_ring_emit_vm_flush,
         .emit_gds_switch = gfx_v7_0_ring_emit_gds_switch,
+        .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush,
         .test_ring = gfx_v7_0_ring_test_ring,
         .test_ib = gfx_v7_0_ring_test_ib,
         .is_lockup = gfx_v7_0_ring_is_lockup,