diff options
| author | Christian König <christian.koenig@amd.com> | 2018-03-09 14:44:32 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-14 15:08:40 -0500 |
| commit | 0660b58c9038f5ef94b8fe33716449945ea786e5 (patch) | |
| tree | f21d991d0e5eee09d9ec168964c79aeb9fca2b98 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | 7f8fb919655ef3011b01bb114fef42107957860a (diff) | |
| download | linux-stable-0660b58c9038f5ef94b8fe33716449945ea786e5.tar.gz linux-stable-0660b58c9038f5ef94b8fe33716449945ea786e5.tar.bz2 linux-stable-0660b58c9038f5ef94b8fe33716449945ea786e5.zip | |
drm/radeon: fix prime teardown order
We unmapped imported DMA-bufs when the GEM handle was dropped, not when the
hardware was done with the buffere.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
CC: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 38431f682ed0..edbb4cd519fd 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -82,6 +82,8 @@ static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo) mutex_unlock(&bo->rdev->gem.mutex); radeon_bo_clear_surface_reg(bo); WARN_ON_ONCE(!list_empty(&bo->va)); + if (bo->gem_base.import_attach) + drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg); drm_gem_object_release(&bo->gem_base); kfree(bo); } |