diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 11:01:26 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 15:53:01 -0400 |
commit | a6f8d7286714363e615561e8aafdf78807fe079d (patch) | |
tree | bd95aea5a1bf3f78b6ac27abf5e8a473a3c1b2fa | |
parent | c3f5875888cc4a65f16eb2298a5b4ba3a39fb1a6 (diff) |
drm/amdgpu/vce: add common 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/amdgpu_vce.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index b0c670294e2f..2c9ea9b50f48 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -803,6 +803,18 @@ void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq, | |||
803 | amdgpu_ring_write(ring, VCE_CMD_END); | 803 | amdgpu_ring_write(ring, VCE_CMD_END); |
804 | } | 804 | } |
805 | 805 | ||
806 | unsigned amdgpu_vce_ring_get_emit_ib_size(struct amdgpu_ring *ring) | ||
807 | { | ||
808 | return | ||
809 | 4; /* amdgpu_vce_ring_emit_ib */ | ||
810 | } | ||
811 | |||
812 | unsigned amdgpu_vce_ring_get_dma_frame_size(struct amdgpu_ring *ring) | ||
813 | { | ||
814 | return | ||
815 | 6; /* amdgpu_vce_ring_emit_fence x1 no user fence */ | ||
816 | } | ||
817 | |||
806 | /** | 818 | /** |
807 | * amdgpu_vce_ring_test_ring - test if VCE ring is working | 819 | * amdgpu_vce_ring_test_ring - test if VCE ring is working |
808 | * | 820 | * |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h index 63f83d0d985c..12729d2852df 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | |||
@@ -42,5 +42,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring); | |||
42 | int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout); | 42 | int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout); |
43 | void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring); | 43 | void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring); |
44 | void amdgpu_vce_ring_end_use(struct amdgpu_ring *ring); | 44 | void amdgpu_vce_ring_end_use(struct amdgpu_ring *ring); |
45 | unsigned amdgpu_vce_ring_get_emit_ib_size(struct amdgpu_ring *ring); | ||
46 | unsigned amdgpu_vce_ring_get_dma_frame_size(struct amdgpu_ring *ring); | ||
45 | 47 | ||
46 | #endif | 48 | #endif |