Commit c6051149 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu/jpeg: add jpeg2.6 start/end 



Add jpeg2.6 start/end with updated PCTL0_MMHUB_DEEPSLEEP_IB address.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.lilu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4b0ee65

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

+38 −2
Original line number Diff line number Diff line
@@ -423,6 +423,42 @@ static void jpeg_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) 
	}

}



/**

 * jpeg_v2_6_dec_ring_insert_start - insert a start command

 *

 * @ring: amdgpu_ring pointer

 *

 * Write a start command to the ring.

 */

static void jpeg_v2_6_dec_ring_insert_start(struct amdgpu_ring *ring)

{

	amdgpu_ring_write(ring, PACKETJ(mmUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,

		0, 0, PACKETJ_TYPE0));

	amdgpu_ring_write(ring, 0x6aa04); /* PCTL0_MMHUB_DEEPSLEEP_IB */



	amdgpu_ring_write(ring, PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR,

		0, 0, PACKETJ_TYPE0));

	amdgpu_ring_write(ring, 0x80000000 | (1 << (ring->me * 2 + 14)));

}



/**

 * jpeg_v2_6_dec_ring_insert_end - insert a end command

 *

 * @ring: amdgpu_ring pointer

 *

 * Write a end command to the ring.

 */

static void jpeg_v2_6_dec_ring_insert_end(struct amdgpu_ring *ring)

{

	amdgpu_ring_write(ring, PACKETJ(mmUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,

		0, 0, PACKETJ_TYPE0));

	amdgpu_ring_write(ring, 0x6aa04); /* PCTL0_MMHUB_DEEPSLEEP_IB */



	amdgpu_ring_write(ring, PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR,

		0, 0, PACKETJ_TYPE0));

	amdgpu_ring_write(ring, (1 << (ring->me * 2 + 14)));

}



static bool jpeg_v2_5_is_idle(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -633,8 +669,8 @@ static const struct amdgpu_ring_funcs jpeg_v2_6_dec_ring_vm_funcs = { 
	.test_ring = amdgpu_jpeg_dec_ring_test_ring,

	.test_ib = amdgpu_jpeg_dec_ring_test_ib,

	.insert_nop = jpeg_v2_0_dec_ring_nop,

	.insert_start = jpeg_v2_0_dec_ring_insert_start,

	.insert_end = jpeg_v2_0_dec_ring_insert_end,

	.insert_start = jpeg_v2_6_dec_ring_insert_start,

	.insert_end = jpeg_v2_6_dec_ring_insert_end,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.begin_use = amdgpu_jpeg_ring_begin_use,

	.end_use = amdgpu_jpeg_ring_end_use,