diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 11:00:11 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 15:53:00 -0400 |
| commit | 23f8f8006a5fd1ec2888a814d70064a84a0e4815 (patch) | |
| tree | 0f1c1184828f3a7c0498da946eae2345b945d78c /drivers/gpu/drm | |
| parent | 928d467448596228af2d4fe3f13251e4fa8de656 (diff) | |
drm/amdgpu/uvd4.2: 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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c index 10c0407dcb6e..f6c941550b8f 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | |||
| @@ -526,6 +526,20 @@ static void uvd_v4_2_ring_emit_ib(struct amdgpu_ring *ring, | |||
| 526 | amdgpu_ring_write(ring, ib->length_dw); | 526 | amdgpu_ring_write(ring, ib->length_dw); |
| 527 | } | 527 | } |
| 528 | 528 | ||
| 529 | static unsigned uvd_v4_2_ring_get_emit_ib_size(struct amdgpu_ring *ring) | ||
| 530 | { | ||
| 531 | return | ||
| 532 | 4; /* uvd_v4_2_ring_emit_ib */ | ||
| 533 | } | ||
| 534 | |||
| 535 | static unsigned uvd_v4_2_ring_get_dma_frame_size(struct amdgpu_ring *ring) | ||
| 536 | { | ||
| 537 | return | ||
| 538 | 2 + /* uvd_v4_2_ring_emit_hdp_flush */ | ||
| 539 | 2 + /* uvd_v4_2_ring_emit_hdp_invalidate */ | ||
| 540 | 14; /* uvd_v4_2_ring_emit_fence x1 no user fence */ | ||
| 541 | } | ||
| 542 | |||
| 529 | /** | 543 | /** |
| 530 | * uvd_v4_2_mc_resume - memory controller programming | 544 | * uvd_v4_2_mc_resume - memory controller programming |
| 531 | * | 545 | * |
| @@ -756,6 +770,8 @@ static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = { | |||
| 756 | .pad_ib = amdgpu_ring_generic_pad_ib, | 770 | .pad_ib = amdgpu_ring_generic_pad_ib, |
| 757 | .begin_use = amdgpu_uvd_ring_begin_use, | 771 | .begin_use = amdgpu_uvd_ring_begin_use, |
| 758 | .end_use = amdgpu_uvd_ring_end_use, | 772 | .end_use = amdgpu_uvd_ring_end_use, |
| 773 | .get_emit_ib_size = uvd_v4_2_ring_get_emit_ib_size, | ||
| 774 | .get_dma_frame_size = uvd_v4_2_ring_get_dma_frame_size, | ||
| 759 | }; | 775 | }; |
| 760 | 776 | ||
| 761 | static void uvd_v4_2_set_ring_funcs(struct amdgpu_device *adev) | 777 | static void uvd_v4_2_set_ring_funcs(struct amdgpu_device *adev) |
