drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled

From chen gong
28863ffe21ff711d5109e3c208676258bdec3a1f in linux 5.10.y/5.10.90
b7865173cf6ae59942e2c69326a06e1c1df5ecf6 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
index 5f800c3..c098609 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v1_0.c
@@ -260,6 +260,13 @@ static int vcn_v1_0_suspend(void *handle)
 {
        int r;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       bool idle_work_unexecuted;
+
+       idle_work_unexecuted = cancel_delayed_work_sync(&adev->vcn.idle_work);
+       if (idle_work_unexecuted) {
+               if (adev->pm.dpm_enabled)
+                       amdgpu_dpm_enable_uvd(adev, false);
+       }
 
        r = vcn_v1_0_hw_fini(adev);
        if (r)