diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 10:58:12 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 15:52:57 -0400 |
commit | 229e2d46da4f5ec7ca7845ccbbdf04bf445c048e (patch) | |
tree | 123a1f9744f5692e2f1f72fdab4c2ac91f9e2244 | |
parent | 7512ad16b532eee288a85a55a41ebf7d0eb8080d (diff) |
drm/amdgpu/si_dma: add ring callbacks for ib and dma frame size
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/si_dma.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index 4cbd4086ee7d..de358193a8f9 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c | |||
@@ -495,6 +495,22 @@ static void si_dma_ring_emit_vm_flush(struct amdgpu_ring *ring, | |||
495 | amdgpu_ring_write(ring, (0 << 28) | 0x20); /* func(always) | poll interval */ | 495 | amdgpu_ring_write(ring, (0 << 28) | 0x20); /* func(always) | poll interval */ |
496 | } | 496 | } |
497 | 497 | ||
498 | static unsigned si_dma_ring_get_emit_ib_size(struct amdgpu_ring *ring) | ||
499 | { | ||
500 | return | ||
501 | 7 + 3; /* si_dma_ring_emit_ib */ | ||
502 | } | ||
503 | |||
504 | static unsigned si_dma_ring_get_dma_frame_size(struct amdgpu_ring *ring) | ||
505 | { | ||
506 | return | ||
507 | 3 + /* si_dma_ring_emit_hdp_flush */ | ||
508 | 3 + /* si_dma_ring_emit_hdp_invalidate */ | ||
509 | 6 + /* si_dma_ring_emit_pipeline_sync */ | ||
510 | 12 + /* si_dma_ring_emit_vm_flush */ | ||
511 | 9 + 9 + 9; /* si_dma_ring_emit_fence x3 for user fence, vm fence */ | ||
512 | } | ||
513 | |||
498 | static int si_dma_early_init(void *handle) | 514 | static int si_dma_early_init(void *handle) |
499 | { | 515 | { |
500 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 516 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
@@ -778,6 +794,8 @@ static const struct amdgpu_ring_funcs si_dma_ring_funcs = { | |||
778 | .test_ib = si_dma_ring_test_ib, | 794 | .test_ib = si_dma_ring_test_ib, |
779 | .insert_nop = amdgpu_ring_insert_nop, | 795 | .insert_nop = amdgpu_ring_insert_nop, |
780 | .pad_ib = si_dma_ring_pad_ib, | 796 | .pad_ib = si_dma_ring_pad_ib, |
797 | .get_emit_ib_size = si_dma_ring_get_emit_ib_size, | ||
798 | .get_dma_frame_size = si_dma_ring_get_dma_frame_size, | ||
781 | }; | 799 | }; |
782 | 800 | ||
783 | static void si_dma_set_ring_funcs(struct amdgpu_device *adev) | 801 | static void si_dma_set_ring_funcs(struct amdgpu_device *adev) |