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

Commit 3ce7803c authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/ttm: Avoid calling drm_ht_remove from atomic context 



On recent kernels, calling drm_ht_remove triggers a might_sleep() warning
from within vfree(). So avoid calling it from atomic context. The use-cases
we fix here are both from destructors so there should be no concurrent
use of the hash tables.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent fe25deb7

drivers/gpu/drm/ttm/ttm_object.c

+1 −3
Original line number Diff line number Diff line
@@ -453,10 +453,10 @@ void ttm_object_file_release(struct ttm_object_file **p_tfile) 
		ttm_ref_object_release(&ref->kref);

	}



	spin_unlock(&tfile->lock);

	for (i = 0; i < TTM_REF_NUM; ++i)

		drm_ht_remove(&tfile->ref_hash[i]);



	spin_unlock(&tfile->lock);

	ttm_object_file_unref(&tfile);

}

EXPORT_SYMBOL(ttm_object_file_release);
@@ -533,9 +533,7 @@ void ttm_object_device_release(struct ttm_object_device **p_tdev) 


	*p_tdev = NULL;



	spin_lock(&tdev->object_lock);

	drm_ht_remove(&tdev->object_hash);

	spin_unlock(&tdev->object_lock);



	kfree(tdev);

}