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

drm/amdgpu/jpeg2.5: 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 ff48f6db

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

+2 −2
Original line number Diff line number Diff line
@@ -187,14 +187,14 @@ static int jpeg_v2_5_hw_init(void *handle) 
static int jpeg_v2_5_hw_fini(void *handle)

{

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

	struct amdgpu_ring *ring;

	int i;



	cancel_delayed_work_sync(&adev->vcn.idle_work);



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

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

			continue;



		ring = &adev->jpeg.inst[i].ring_dec;

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

		      RREG32_SOC15(JPEG, i, mmUVD_JRBC_STATUS))

			jpeg_v2_5_set_powergating_state(adev, AMD_PG_STATE_GATE);