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_gem.c | |
| parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
| parent | 7d617264eb22b18d979eac6e85877a141253034e (diff) | |
| download | linux-4cdc8f1285a4a0e0b8d13f353e4a72349537b0d0.tar.gz linux-4cdc8f1285a4a0e0b8d13f353e4a72349537b0d0.tar.xz | |
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 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index e48b4ec88c8c..ca6c931dabfa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -36,8 +36,6 @@ void amdgpu_gem_object_free(struct drm_gem_object *gobj) struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj); if (robj) { - if (robj->gem_base.import_attach) - drm_prime_gem_destroy(&robj->gem_base, robj->tbo.sg); amdgpu_mn_unregister(robj); amdgpu_bo_unref(&robj); } |