aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonk Liu <Monk.Liu@amd.com>2017-07-04 03:43:38 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 15:14:10 -0400
commit6e2e216fadd80b4280783bb78e543593ebf2cb69 (patch)
tree50f3d44ea6b4c0ef2af79f804727fd2dbf05e79b
parent1d4e0a8c4f12acbc0767f8f9fd75005b9125ada6 (diff)
drm/amdgpu:use formal register to trigger hdp invalidate
Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 0a8072f73a3b..31891149e6fc 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -3535,7 +3535,7 @@ static void gfx_v9_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
3535static void gfx_v9_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring) 3535static void gfx_v9_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
3536{ 3536{
3537 gfx_v9_0_write_data_to_reg(ring, 0, true, 3537 gfx_v9_0_write_data_to_reg(ring, 0, true,
3538 SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 1); 3538 SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 1);
3539} 3539}
3540 3540
3541static void gfx_v9_0_ring_emit_ib_gfx(struct amdgpu_ring *ring, 3541static void gfx_v9_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index fd7c72aaafa6..d5f3848af26a 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -398,7 +398,7 @@ static void sdma_v4_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
398{ 398{
399 amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_SRBM_WRITE) | 399 amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_SRBM_WRITE) |
400 SDMA_PKT_SRBM_WRITE_HEADER_BYTE_EN(0xf)); 400 SDMA_PKT_SRBM_WRITE_HEADER_BYTE_EN(0xf));
401 amdgpu_ring_write(ring, SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0)); 401 amdgpu_ring_write(ring, SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE));
402 amdgpu_ring_write(ring, 1); 402 amdgpu_ring_write(ring, 1);
403} 403}
404 404
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 23a85750edd6..b8ed8faf2003 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -1161,7 +1161,7 @@ static void uvd_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
1161 */ 1161 */
1162static void uvd_v7_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring) 1162static void uvd_v7_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
1163{ 1163{
1164 amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 0)); 1164 amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 0));
1165 amdgpu_ring_write(ring, 1); 1165 amdgpu_ring_write(ring, 1);
1166} 1166}
1167 1167
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 21e7b88401e1..1eb4d79d6e30 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -812,7 +812,7 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64
812 */ 812 */
813static void vcn_v1_0_dec_ring_emit_hdp_invalidate(struct amdgpu_ring *ring) 813static void vcn_v1_0_dec_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
814{ 814{
815 amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 0)); 815 amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 0));
816 amdgpu_ring_write(ring, 1); 816 amdgpu_ring_write(ring, 1);
817} 817}
818 818