Merge "msm: kgsl: Don't wait for room in context queue when context is invalidated" (1168180c) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/adreno_dispatch.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -1185,7 +1185,16 @@ static inline int _wait_for_room_in_context_queue(
		spin_lock(&drawctxt->lock);
		trace_adreno_drawctxt_wake(drawctxt);

		if (ret <= 0)
		/*
		* Account for the possibility that the context got invalidated
		* while we were sleeping
		*/

		if (ret >= 1) {
		ret = _check_context_state(&drawctxt->base);
		if (ret)
		return ret;
		} else
		return (ret == 0) ? -ETIMEDOUT : (int) ret;
		}

		@@ -1200,15 +1209,7 @@ static unsigned int _check_context_state_to_queue_cmds(
		if (ret)
		return ret;

		ret = _wait_for_room_in_context_queue(drawctxt);
		if (ret)
		return ret;

		/*
		* Account for the possiblity that the context got invalidated
		* while we were sleeping
		*/
		return _check_context_state(&drawctxt->base);
		return _wait_for_room_in_context_queue(drawctxt);
		}

		static void _queue_drawobj(struct adreno_context *drawctxt,