diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-09-28 09:30:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-28 09:30:22 +1000 |
| commit | fcb1349a2af5a3c4a1d789bb5d1a9b3e582652a3 (patch) | |
| tree | 8b1936b6d705f73fbbf63ed9314cc8d3aa286294 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
| parent | Merge tag 'drm-misc-fixes-2018-09-27-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (diff) | |
| parent | drm/amd/display: Fix Edid emulation for linux (diff) | |
| download | linux-dev-fcb1349a2af5a3c4a1d789bb5d1a9b3e582652a3.tar.xz linux-dev-fcb1349a2af5a3c4a1d789bb5d1a9b3e582652a3.zip | |
Merge branch 'drm-fixes-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just a few fixes for 4.19:
- Couple of suspend/resume fixes
- Fix EDID emulation with DC
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927155418.2813-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 0cc5190f4f36..5f3f54073818 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -258,6 +258,8 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev) { int i; + cancel_delayed_work_sync(&adev->vce.idle_work); + if (adev->vce.vcpu_bo == NULL) return 0; @@ -268,7 +270,6 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev) if (i == AMDGPU_MAX_VCE_HANDLES) return 0; - cancel_delayed_work_sync(&adev->vce.idle_work); /* TODO: suspending running encoding sessions isn't supported */ return -EINVAL; } |