diff options
| author | Dave Airlie <[email protected]> | 2018-09-28 09:30:11 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2018-09-28 09:30:22 +1000 |
| commit | fcb1349a2af5a3c4a1d789bb5d1a9b3e582652a3 (patch) | |
| tree | 8b1936b6d705f73fbbf63ed9314cc8d3aa286294 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
| parent | adba0e5493ab21fb5098bc1654aca6826036273c (diff) | |
| parent | fbbdadf2faf17cd88e9c447701495540377c5743 (diff) | |
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 <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index fd654a4406db..400fc74bbae2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -153,11 +153,11 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) unsigned size; void *ptr; + cancel_delayed_work_sync(&adev->vcn.idle_work); + if (adev->vcn.vcpu_bo == NULL) return 0; - cancel_delayed_work_sync(&adev->vcn.idle_work); - size = amdgpu_bo_size(adev->vcn.vcpu_bo); ptr = adev->vcn.cpu_addr; |