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

Commit 05991110 authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Ben Skeggs
Browse files

drm/nouveau: set TASK_(UN)INTERRUPTIBLE before schedule_timeout() 



set_current_state() is called only once before the first iteration.
After return from schedule_timeout() current state is TASK_RUNNING. If
we are going to wait again, set_current_state() must be called.

Signed-off-by: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0ccb3a75

drivers/gpu/drm/nouveau/nouveau_fence.c

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,6 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) 
	unsigned long timeout = jiffies + (3 * DRM_HZ);

	int ret = 0;



	__set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);



	while (1) {

		if (nouveau_fence_signalled(sync_obj, sync_arg))

			break;
@@ -197,6 +195,8 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) 
			break;

		}



		__set_current_state(intr ? TASK_INTERRUPTIBLE

			: TASK_UNINTERRUPTIBLE);

		if (lazy)

			schedule_timeout(1);