Commit 09e24a0b authored by Sathishkumar S's avatar Sathishkumar S Committed by Alex Deucher
Browse files

drm/amdgpu: Add ring reset callback for JPEG2_5_0 



Add ring reset function callback for JPEG2_5_0 to
recover from job timeouts without a full gpu reset.

Signed-off-by: default avatarSathishkumar S <sathishkumar.sundararaju@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb493aee

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

+15 −1
Original line number Diff line number Diff line
@@ -167,7 +167,10 @@ static int jpeg_v2_5_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	return 0;

	adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);



	return r;

}



/**
@@ -186,6 +189,8 @@ static int jpeg_v2_5_sw_fini(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	amdgpu_jpeg_sysfs_reset_mask_fini(adev);



	r = amdgpu_jpeg_sw_fini(adev);



	return r;
@@ -638,6 +643,13 @@ static int jpeg_v2_5_process_interrupt(struct amdgpu_device *adev, 
	return 0;

}



static int jpeg_v2_5_ring_reset(struct amdgpu_ring *ring, unsigned int vmid)

{

	jpeg_v2_5_stop_inst(ring->adev, ring->me);

	jpeg_v2_5_start_inst(ring->adev, ring->me);

	return amdgpu_ring_test_helper(ring);

}



static const struct amd_ip_funcs jpeg_v2_5_ip_funcs = {

	.name = "jpeg_v2_5",

	.early_init = jpeg_v2_5_early_init,
@@ -700,6 +712,7 @@ static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = { 
	.emit_wreg = jpeg_v2_0_dec_ring_emit_wreg,

	.emit_reg_wait = jpeg_v2_0_dec_ring_emit_reg_wait,

	.emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper,

	.reset = jpeg_v2_5_ring_reset,

};



static const struct amdgpu_ring_funcs jpeg_v2_6_dec_ring_vm_funcs = {
@@ -730,6 +743,7 @@ static const struct amdgpu_ring_funcs jpeg_v2_6_dec_ring_vm_funcs = { 
	.emit_wreg = jpeg_v2_0_dec_ring_emit_wreg,

	.emit_reg_wait = jpeg_v2_0_dec_ring_emit_reg_wait,

	.emit_reg_write_reg_wait = amdgpu_ring_emit_reg_write_reg_wait_helper,

	.reset = jpeg_v2_5_ring_reset,

};



static void jpeg_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev)