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

drm/amdgpu/jpeg3: add cancel_delayed_work_sync before power gate 



Add cancel_delayed_work_sync before set power gating state
to avoid race condition issue when power gating.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 23f10a57

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

+2 −2
Original line number Diff line number Diff line
@@ -159,9 +159,9 @@ static int jpeg_v3_0_hw_init(void *handle) 
static int jpeg_v3_0_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct amdgpu_ring *ring;



	ring = &adev->jpeg.inst->ring_dec;

	cancel_delayed_work_sync(&adev->vcn.idle_work);



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

	      RREG32_SOC15(JPEG, 0, mmUVD_JRBC_STATUS))

		jpeg_v3_0_set_powergating_state(adev, AMD_PG_STATE_GATE);