Merge "msm: kgsl: Don't call del_timer_sync() with spinlock" (de60f5ab) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/adreno_dispatch.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -428,12 +428,6 @@ static struct kgsl_cmdbatch _get_cmdbatch(struct adreno_context drawctxt)
		return ERR_PTR(-EAGAIN);
		}

		/*
		* Otherwise, delete the timer to make sure it is good
		* and dead before queuing the buffer
		*/
		del_timer_sync(&cmdbatch->timer);

		_pop_cmdbatch(drawctxt);
		return cmdbatch;
		}
		@@ -453,6 +447,14 @@ static struct kgsl_cmdbatch *adreno_dispatcher_get_cmdbatch(
		cmdbatch = _get_cmdbatch(drawctxt);
		spin_unlock(&drawctxt->lock);

		/*
		* Delete the timer and wait for timer handler to finish executing
		* on another core before queueing the buffer. We must do this
		* without holding any spin lock that the timer handler might be using
		*/
		if (!IS_ERR_OR_NULL(cmdbatch))
		del_timer_sync(&cmdbatch->timer);

		return cmdbatch;
		}