Commit 93df7487 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/jpeg: cancel the jpeg worker 



Looks like these got missed when jpeg was split from vcn.
Cancel the jpeg workers rather than vcn workers.

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b61badd2

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

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static void jpeg_v1_0_set_irq_funcs(struct amdgpu_device *adev) 
static void jpeg_v1_0_ring_begin_use(struct amdgpu_ring *ring)

{

	struct	amdgpu_device *adev = ring->adev;

	bool	set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work);

	bool	set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);

	int		cnt = 0;



	mutex_lock(&adev->vcn.vcn1_jpeg1_workaround);

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

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int jpeg_v2_0_hw_fini(struct amdgpu_ip_block *ip_block) 
{

	struct amdgpu_device *adev = ip_block->adev;



	cancel_delayed_work_sync(&adev->vcn.idle_work);

	cancel_delayed_work_sync(&adev->jpeg.idle_work);



	if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&

	      RREG32_SOC15(JPEG, 0, mmUVD_JRBC_STATUS))

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int jpeg_v2_5_hw_fini(struct amdgpu_ip_block *ip_block) 
	struct amdgpu_device *adev = ip_block->adev;

	int i;



	cancel_delayed_work_sync(&adev->vcn.idle_work);

	cancel_delayed_work_sync(&adev->jpeg.idle_work);



	for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {

		if (adev->jpeg.harvest_config & (1 << i))

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int jpeg_v3_0_hw_fini(struct amdgpu_ip_block *ip_block) 
{

	struct amdgpu_device *adev = ip_block->adev;



	cancel_delayed_work_sync(&adev->vcn.idle_work);

	cancel_delayed_work_sync(&adev->jpeg.idle_work);



	if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&

	      RREG32_SOC15(JPEG, 0, mmUVD_JRBC_STATUS))

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int jpeg_v4_0_hw_fini(struct amdgpu_ip_block *ip_block) 
{

	struct amdgpu_device *adev = ip_block->adev;



	cancel_delayed_work_sync(&adev->vcn.idle_work);

	cancel_delayed_work_sync(&adev->jpeg.idle_work);

	if (!amdgpu_sriov_vf(adev)) {

		if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&

			RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))