diff options
| author | Ingo Molnar <[email protected]> | 2018-03-24 08:25:26 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2018-03-24 08:25:26 +0000 |
| commit | ea2301b6220117398a1de4f4bc853fbe886d5e08 (patch) | |
| tree | 8823c3becd0b4fd3db9706892845cd02f760627a /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS (diff) | |
| parent | Merge tag 'trace-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-ea2301b6220117398a1de4f4bc853fbe886d5e08.tar.gz kernel-ea2301b6220117398a1de4f4bc853fbe886d5e08.zip | |
Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -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)) { |