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

Commit 641f53c0 authored by Thierry Reding's avatar Thierry Reding Committed by Ben Skeggs
Browse files

drm/nouveau: Fix ordering between TTM and GEM release 



When the last reference to a TTM BO is dropped, ttm_bo_release() will
acquire the DMA reservation object's wound/wait mutex while trying to
clean up (ttm_bo_cleanup_refs_or_queue() via ttm_bo_release()). It is
therefore essential that drm_gem_object_release() be called after the
TTM BO has been uninitialized, otherwise drm_gem_object_release() has
already destroyed the wound/wait mutex (via dma_resv_fini()).

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0bb21c96

drivers/gpu/drm/nouveau/nouveau_bo.c

+8 −2
Original line number Diff line number Diff line
@@ -136,10 +136,16 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) 
	struct drm_device *dev = drm->dev;

	struct nouveau_bo *nvbo = nouveau_bo(bo);



	if (unlikely(nvbo->bo.base.filp))

		DRM_ERROR("bo %p still attached to GEM object\n", bo);

	WARN_ON(nvbo->pin_refcnt > 0);

	nv10_bo_put_tile_region(dev, nvbo->tile, NULL);



	/*

	 * If nouveau_bo_new() allocated this buffer, the GEM object was never

	 * initialized, so don't attempt to release it.

	 */

	if (bo->base.dev)

		drm_gem_object_release(&bo->base);



	kfree(nvbo);

}

drivers/gpu/drm/nouveau/nouveau_gem.c

+0 −4
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ nouveau_gem_object_del(struct drm_gem_object *gem) 
	if (gem->import_attach)

		drm_prime_gem_destroy(gem, nvbo->bo.sg);



	drm_gem_object_release(gem);



	/* reset filp so nouveau_bo_del_ttm() can test for it */

	gem->filp = NULL;

	ttm_bo_put(&nvbo->bo);



	pm_runtime_mark_last_busy(dev);