diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-03-15 09:23:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-15 09:23:54 +1000 |
| commit | 4cdc8f1285a4a0e0b8d13f353e4a72349537b0d0 (patch) | |
| tree | 0418128e85f47c6e1c2edbec2e7714a88e7e6074 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | Linux 4.16-rc5 (diff) | |
| parent | drm/amdgpu/dce: Don't turn off DP sink when disconnected (diff) | |
| download | wireguard-linux-4cdc8f1285a4a0e0b8d13f353e4a72349537b0d0.tar.xz wireguard-linux-4cdc8f1285a4a0e0b8d13f353e4a72349537b0d0.zip | |
Merge branch 'drm-fixes-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
A few fixes for 4.16:
- Fix a backlight S/R regression on amdgpu
- Fix prime teardown on radeon and amdgpu
- DP fix for amdgpu
* 'drm-fixes-4.16' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu/dce: Don't turn off DP sink when disconnected
drm/amdgpu: save/restore backlight level in legacy dce code
drm/radeon: fix prime teardown order
drm/amdgpu: fix prime teardown order
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 5c4c3e0d527b..1220322c1680 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -56,6 +56,8 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) amdgpu_bo_kunmap(bo); + if (bo->gem_base.import_attach) + drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg); drm_gem_object_release(&bo->gem_base); amdgpu_bo_unref(&bo->parent); if (!list_empty(&bo->shadow_list)) { |