Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3f58758 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/uvd6: add ring callbacks for ib and dma frame size 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cdbbb784

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

+29 −0
Original line number Diff line number Diff line
@@ -725,6 +725,31 @@ static void uvd_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) 
	amdgpu_ring_write(ring, 0xE);

}



static unsigned uvd_v6_0_ring_get_emit_ib_size(struct amdgpu_ring *ring)

{

	return

		8; /* uvd_v6_0_ring_emit_ib */

}



static unsigned uvd_v6_0_ring_get_dma_frame_size(struct amdgpu_ring *ring)

{

	return

		2 + /* uvd_v6_0_ring_emit_hdp_flush */

		2 + /* uvd_v6_0_ring_emit_hdp_invalidate */

		10 + /* uvd_v6_0_ring_emit_pipeline_sync */

		14; /* uvd_v6_0_ring_emit_fence x1 no user fence */

}



static unsigned uvd_v6_0_ring_get_dma_frame_size_vm(struct amdgpu_ring *ring)

{

	return

		2 + /* uvd_v6_0_ring_emit_hdp_flush */

		2 + /* uvd_v6_0_ring_emit_hdp_invalidate */

		10 + /* uvd_v6_0_ring_emit_pipeline_sync */

		20 + /* uvd_v6_0_ring_emit_vm_flush */

		14 + 14; /* uvd_v6_0_ring_emit_fence x2 vm fence */

}



static bool uvd_v6_0_is_idle(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1037,6 +1062,8 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = { 
	.pad_ib = amdgpu_ring_generic_pad_ib,

	.begin_use = amdgpu_uvd_ring_begin_use,

	.end_use = amdgpu_uvd_ring_end_use,

	.get_emit_ib_size = uvd_v6_0_ring_get_emit_ib_size,

	.get_dma_frame_size = uvd_v6_0_ring_get_dma_frame_size,

};



static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = {
@@ -1056,6 +1083,8 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { 
	.pad_ib = amdgpu_ring_generic_pad_ib,

	.begin_use = amdgpu_uvd_ring_begin_use,

	.end_use = amdgpu_uvd_ring_end_use,

	.get_emit_ib_size = uvd_v6_0_ring_get_emit_ib_size,

	.get_dma_frame_size = uvd_v6_0_ring_get_dma_frame_size_vm,

};



static void uvd_v6_0_set_ring_funcs(struct amdgpu_device *adev)