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

Commit 71773989 authored by Christian König's avatar Christian König Committed by Marissa Wall
Browse files

UPSTREAM: drm/ttm: fix ttm_bo_wait 



reservation_object_wait_timeout_rcu() should enable signaling even with a
zero timeout, but ttm_bo_wait() can also be called from atomic context and
then it is not a good idea to do this.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
  [sumits: fix checkpatch warnings]
Link: http://patchwork.freedesktop.org/patch/msgid/1478553376-18575-3-git-send-email-alexander.deucher@amd.com


(cherry picked from commit 98a6dd909bbd247ce10f36ce709906bc5e9dfeb0)

Change-Id: I142f7a853c9f6b16567531d7c332ba9f99325ec2
Signed-off-by: default avatarMarissa Wall <marissaw@google.com>
parent b9aad976

drivers/gpu/drm/ttm/ttm_bo.c

+8 −1
Original line number Diff line number Diff line
@@ -1602,7 +1602,14 @@ EXPORT_SYMBOL(ttm_bo_unmap_virtual); 
int ttm_bo_wait(struct ttm_buffer_object *bo,

		bool interruptible, bool no_wait)

{

	long timeout = no_wait ? 0 : 15 * HZ;

	long timeout = 15 * HZ;



	if (no_wait) {

		if (reservation_object_test_signaled_rcu(bo->resv, true))

			return 0;

		else

			return -EBUSY;

	}



	timeout = reservation_object_wait_timeout_rcu(bo->resv, true,

						      interruptible, timeout);