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

drm/amdgpu/jpeg5: add queue reset 



Add queue reset support for jpeg 5.0.0.
Use the new helpers to re-emit the unprocessed state
after resetting the queue.

Reviewed-by: default avatarSathishkumar S <sathishkumar.sundararaju@amd.com>
Tested-by: default avatarSathishkumar S <sathishkumar.sundararaju@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf07ece3

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

+22 −1
Original line number Diff line number Diff line
@@ -120,9 +120,10 @@ static int jpeg_v5_0_0_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	/* TODO: Add queue reset mask when FW fully supports it */

	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);

	if (r)

		return r;
@@ -644,6 +645,25 @@ static int jpeg_v5_0_0_process_interrupt(struct amdgpu_device *adev, 
	return 0;

}



static int jpeg_v5_0_0_ring_reset(struct amdgpu_ring *ring,

				  unsigned int vmid,

				  struct amdgpu_fence *timedout_fence)

{

	int r;



	if (!(ring->adev->jpeg.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))

		return -EOPNOTSUPP;



	amdgpu_ring_reset_helper_begin(ring, timedout_fence);

	r = jpeg_v5_0_0_stop(ring->adev);

	if (r)

		return r;

	r = jpeg_v5_0_0_start(ring->adev);

	if (r)

		return r;

	return amdgpu_ring_reset_helper_end(ring, timedout_fence);

}



static const struct amd_ip_funcs jpeg_v5_0_0_ip_funcs = {

	.name = "jpeg_v5_0_0",

	.early_init = jpeg_v5_0_0_early_init,
@@ -689,6 +709,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = { 
	.emit_wreg = jpeg_v4_0_3_dec_ring_emit_wreg,

	.emit_reg_wait = jpeg_v4_0_3_dec_ring_emit_reg_wait,

	.emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper,

	.reset = jpeg_v5_0_0_ring_reset,

};



static void jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev)