diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 76cdef29b9d1..44c041a1fe68 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |||
@@ -810,21 +810,6 @@ static void vcn_v1_0_dec_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 | |||
810 | } | 810 | } |
811 | 811 | ||
812 | /** | 812 | /** |
813 | * vcn_v1_0_dec_ring_hdp_invalidate - emit an hdp invalidate | ||
814 | * | ||
815 | * @ring: amdgpu_ring pointer | ||
816 | * | ||
817 | * Emits an hdp invalidate. | ||
818 | */ | ||
819 | static void vcn_v1_0_dec_ring_emit_hdp_invalidate(struct amdgpu_ring *ring) | ||
820 | { | ||
821 | struct amdgpu_device *adev = ring->adev; | ||
822 | |||
823 | amdgpu_ring_write(ring, PACKET0(SOC15_REG_OFFSET(HDP, 0, mmHDP_READ_CACHE_INVALIDATE), 0)); | ||
824 | amdgpu_ring_write(ring, 1); | ||
825 | } | ||
826 | |||
827 | /** | ||
828 | * vcn_v1_0_dec_ring_emit_ib - execute indirect buffer | 813 | * vcn_v1_0_dec_ring_emit_ib - execute indirect buffer |
829 | * | 814 | * |
830 | * @ring: amdgpu_ring pointer | 815 | * @ring: amdgpu_ring pointer |
@@ -1096,7 +1081,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { | |||
1096 | .get_wptr = vcn_v1_0_dec_ring_get_wptr, | 1081 | .get_wptr = vcn_v1_0_dec_ring_get_wptr, |
1097 | .set_wptr = vcn_v1_0_dec_ring_set_wptr, | 1082 | .set_wptr = vcn_v1_0_dec_ring_set_wptr, |
1098 | .emit_frame_size = | 1083 | .emit_frame_size = |
1099 | 2 + /* vcn_v1_0_dec_ring_emit_hdp_invalidate */ | 1084 | 6 + 6 + /* hdp invalidate / flush */ |
1100 | SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 + 16 + /* vcn_v1_0_dec_ring_emit_vm_flush */ | 1085 | SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 + 16 + /* vcn_v1_0_dec_ring_emit_vm_flush */ |
1101 | 14 + 14 + /* vcn_v1_0_dec_ring_emit_fence x2 vm fence */ | 1086 | 14 + 14 + /* vcn_v1_0_dec_ring_emit_fence x2 vm fence */ |
1102 | 6, | 1087 | 6, |
@@ -1104,7 +1089,6 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { | |||
1104 | .emit_ib = vcn_v1_0_dec_ring_emit_ib, | 1089 | .emit_ib = vcn_v1_0_dec_ring_emit_ib, |
1105 | .emit_fence = vcn_v1_0_dec_ring_emit_fence, | 1090 | .emit_fence = vcn_v1_0_dec_ring_emit_fence, |
1106 | .emit_vm_flush = vcn_v1_0_dec_ring_emit_vm_flush, | 1091 | .emit_vm_flush = vcn_v1_0_dec_ring_emit_vm_flush, |
1107 | .emit_hdp_invalidate = vcn_v1_0_dec_ring_emit_hdp_invalidate, | ||
1108 | .test_ring = amdgpu_vcn_dec_ring_test_ring, | 1092 | .test_ring = amdgpu_vcn_dec_ring_test_ring, |
1109 | .test_ib = amdgpu_vcn_dec_ring_test_ib, | 1093 | .test_ib = amdgpu_vcn_dec_ring_test_ib, |
1110 | .insert_nop = vcn_v1_0_ring_insert_nop, | 1094 | .insert_nop = vcn_v1_0_ring_insert_nop, |