Skip to content

Commit

Permalink
drm/amdgpu/vcn3: add cancel_delayed_work_sync before power gate
Browse files Browse the repository at this point in the history
[ Upstream commit 4a62542 ]

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: Sasha Levin <sashal@kernel.org>
  • Loading branch information
James Zhu authored and gregkh committed Jun 10, 2021
1 parent 1f64f5e commit 4a72869
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
Expand Up @@ -367,15 +367,14 @@ static int vcn_v3_0_hw_init(void *handle)
static int vcn_v3_0_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->vcn.num_vcn_inst; ++i) {
if (adev->vcn.harvest_config & (1 << i))
continue;

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

if (!amdgpu_sriov_vf(adev)) {
if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) ||
(adev->vcn.cur_state != AMD_PG_STATE_GATE &&
Expand Down

0 comments on commit 4a72869

Please sign in to comment.