]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu:use formal register to trigger hdp invalidate
authorMonk Liu <Monk.Liu@amd.com>
Tue, 4 Jul 2017 07:43:38 +0000 (15:43 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 19:14:10 +0000 (15:14 -0400)
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>
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c

index 0a8072f73a3b4460726771db4ab2640a8e53e518..31891149e6fcd4caf2540a14c74a12cb82e46327 100644 (file)
@@ -3535,7 +3535,7 @@ static void gfx_v9_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
 static void gfx_v9_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 {
        gfx_v9_0_write_data_to_reg(ring, 0, true,
-                                  SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 1);
+                                  SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 1);
 }
 
 static void gfx_v9_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
index fd7c72aaafa6248a566996140128a1fc22569279..d5f3848af26aebe4f50c80e1097a3c2c90e98fbf 100644 (file)
@@ -398,7 +398,7 @@ static void sdma_v4_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 {
        amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_SRBM_WRITE) |
                          SDMA_PKT_SRBM_WRITE_HEADER_BYTE_EN(0xf));
-       amdgpu_ring_write(ring, SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0));
+       amdgpu_ring_write(ring, SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE));
        amdgpu_ring_write(ring, 1);
 }
 
index 23a85750edd6fba1c591709dbededb92e54dfec6..b8ed8faf200355db969cc5f1d5c920c31b33accb 100644 (file)
@@ -1161,7 +1161,7 @@ static void uvd_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
  */
 static void uvd_v7_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 {
-       amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 0));
+       amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 0));
        amdgpu_ring_write(ring, 1);
 }
 
index 21e7b88401e1e36a460fe66ff873ce59d2bc6968..1eb4d79d6e306f7137daa4e57e58078993f608d3 100644 (file)
@@ -812,7 +812,7 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64
  */
 static void vcn_v1_0_dec_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 {
-       amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_DEBUG0), 0));
+       amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 0));
        amdgpu_ring_write(ring, 1);
 }