From: James Zhu <James.Zhu@amd.com>
Date: Wed, 19 May 2021 15:40:39 +0000 (-0400)
Subject: drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate
X-Git-Tag: v5.4.124~144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03aeefb46f0792fd4ded248f5837e5ab8a5b8773;p=thirdparty%2Fkernel%2Fstable.git

drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate

commit 2fb536ea42d557f39f70c755f68e1aa1ad466c55 upstream.

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

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 9d778a0b2c5e2..4c9a1633b02a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -302,6 +302,8 @@ static int vcn_v2_5_hw_fini(void *handle)
 	struct amdgpu_ring *ring;
 	int i;
 
+	cancel_delayed_work_sync(&adev->vcn.idle_work);
+
 	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
 		if (adev->vcn.harvest_config & (1 << i))
 			continue;