diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_dma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si_dma.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index 8f9509f6f15b..e59521bacf0b 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c | |||
@@ -75,20 +75,6 @@ static void si_dma_ring_emit_ib(struct amdgpu_ring *ring, | |||
75 | 75 | ||
76 | } | 76 | } |
77 | 77 | ||
78 | static void si_dma_ring_emit_hdp_flush(struct amdgpu_ring *ring) | ||
79 | { | ||
80 | amdgpu_ring_write(ring, DMA_PACKET(DMA_PACKET_SRBM_WRITE, 0, 0, 0, 0)); | ||
81 | amdgpu_ring_write(ring, (0xf << 16) | (HDP_MEM_COHERENCY_FLUSH_CNTL)); | ||
82 | amdgpu_ring_write(ring, 1); | ||
83 | } | ||
84 | |||
85 | static void si_dma_ring_emit_hdp_invalidate(struct amdgpu_ring *ring) | ||
86 | { | ||
87 | amdgpu_ring_write(ring, DMA_PACKET(DMA_PACKET_SRBM_WRITE, 0, 0, 0, 0)); | ||
88 | amdgpu_ring_write(ring, (0xf << 16) | (HDP_DEBUG0)); | ||
89 | amdgpu_ring_write(ring, 1); | ||
90 | } | ||
91 | |||
92 | /** | 78 | /** |
93 | * si_dma_ring_emit_fence - emit a fence on the DMA ring | 79 | * si_dma_ring_emit_fence - emit a fence on the DMA ring |
94 | * | 80 | * |
@@ -772,8 +758,7 @@ static const struct amdgpu_ring_funcs si_dma_ring_funcs = { | |||
772 | .get_wptr = si_dma_ring_get_wptr, | 758 | .get_wptr = si_dma_ring_get_wptr, |
773 | .set_wptr = si_dma_ring_set_wptr, | 759 | .set_wptr = si_dma_ring_set_wptr, |
774 | .emit_frame_size = | 760 | .emit_frame_size = |
775 | 3 + /* si_dma_ring_emit_hdp_flush */ | 761 | 3 + 3 + /* hdp flush / invalidate */ |
776 | 3 + /* si_dma_ring_emit_hdp_invalidate */ | ||
777 | 6 + /* si_dma_ring_emit_pipeline_sync */ | 762 | 6 + /* si_dma_ring_emit_pipeline_sync */ |
778 | SI_FLUSH_GPU_TLB_NUM_WREG * 3 + 6 + /* si_dma_ring_emit_vm_flush */ | 763 | SI_FLUSH_GPU_TLB_NUM_WREG * 3 + 6 + /* si_dma_ring_emit_vm_flush */ |
779 | 9 + 9 + 9, /* si_dma_ring_emit_fence x3 for user fence, vm fence */ | 764 | 9 + 9 + 9, /* si_dma_ring_emit_fence x3 for user fence, vm fence */ |
@@ -782,8 +767,6 @@ static const struct amdgpu_ring_funcs si_dma_ring_funcs = { | |||
782 | .emit_fence = si_dma_ring_emit_fence, | 767 | .emit_fence = si_dma_ring_emit_fence, |
783 | .emit_pipeline_sync = si_dma_ring_emit_pipeline_sync, | 768 | .emit_pipeline_sync = si_dma_ring_emit_pipeline_sync, |
784 | .emit_vm_flush = si_dma_ring_emit_vm_flush, | 769 | .emit_vm_flush = si_dma_ring_emit_vm_flush, |
785 | .emit_hdp_flush = si_dma_ring_emit_hdp_flush, | ||
786 | .emit_hdp_invalidate = si_dma_ring_emit_hdp_invalidate, | ||
787 | .test_ring = si_dma_ring_test_ring, | 770 | .test_ring = si_dma_ring_test_ring, |
788 | .test_ib = si_dma_ring_test_ib, | 771 | .test_ib = si_dma_ring_test_ib, |
789 | .insert_nop = amdgpu_ring_insert_nop, | 772 | .insert_nop = amdgpu_ring_insert_nop, |