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

Commit 102d2cdb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Use main wait_event macros instead of helper"

parents bb047aa5 3bdd69a6

drivers/gpu/msm/adreno_drawctxt.c

+4 −7
Original line number Diff line number Diff line
@@ -86,11 +86,10 @@ int adreno_drawctxt_wait(struct adreno_device *adreno_dev, 
	mutex_unlock(&device->mutex);



	if (timeout) {

		ret_temp = msecs_to_jiffies(timeout);

		__wait_event_interruptible_timeout(

		ret_temp = wait_event_interruptible_timeout(

			drawctxt->waiting,

			_check_context_timestamp(device, drawctxt, timestamp),

			ret_temp);

			msecs_to_jiffies(timeout));



		if (ret_temp == 0)

			ret = -ETIMEDOUT;
@@ -99,10 +98,8 @@ int adreno_drawctxt_wait(struct adreno_device *adreno_dev, 
		else

			ret = (int) ret_temp;

	} else {

		__wait_event_interruptible(drawctxt->waiting,

			_check_context_timestamp(device, drawctxt, timestamp),

				ret_temp);

		ret = (int)ret_temp;

		ret = wait_event_interruptible(drawctxt->waiting,

			_check_context_timestamp(device, drawctxt, timestamp));

	}



	mutex_lock(&device->mutex);