Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4a9192c authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix prime teardown order 



commit 342038d92403b3efa1138a8599666b9f026279d6 upstream.

We unmapped imported DMA-bufs when the GEM handle was dropped, not when the
hardware was done with the buffere.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdbd0a20

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,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)) {