drm/amdgpu: disable HDP flushes on APUs

We completely bypass the HDP now.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index e02a70dd37b5fd9d2b1bfb7a7a9053d958572bdd..e357e42c10c7a18c0ac24b65b99a95de1493b987 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -172,7 +172,11 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                }
        }
 
-       if (ring->funcs->emit_hdp_flush)
+       if (ring->funcs->emit_hdp_flush
+#ifdef CONFIG_X86_64
+           && !(adev->flags & AMD_IS_APU)
+#endif
+          )
                amdgpu_ring_emit_hdp_flush(ring);
 
        skip_preamble = ring->current_ctx == fence_ctx;
@@ -202,7 +206,11 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                need_ctx_switch = false;
        }
 
-       if (ring->funcs->emit_hdp_invalidate)
+       if (ring->funcs->emit_hdp_invalidate
+#ifdef CONFIG_X86_64
+           && !(adev->flags & AMD_IS_APU)
+#endif
+          )
                amdgpu_ring_emit_hdp_invalidate(ring);
 
        r = amdgpu_fence_emit(ring, f);