Merge "msm: kgsl: Support the KGSL_CONTEXT_CTX_SWITCH flag" (3937a60d) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno_dispatch.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -598,13 +598,22 @@ int adreno_dispatcher_queue_cmd(struct adreno_device *adreno_dev,
		}

		/*
		* After skipping to the end of the frame we need to force the preamble
		* to run (if it exists) regardless of the context state.
		* Force the preamble for this submission only - this is usually
		* requested by the dispatcher as part of fault recovery
		*/

		if (test_and_clear_bit(ADRENO_CONTEXT_FORCE_PREAMBLE, &drawctxt->priv))
		set_bit(CMDBATCH_FLAG_FORCE_PREAMBLE, &cmdbatch->priv);

		/*
		* Force the premable if set from userspace in the context or cmdbatch
		* flags
		*/

		if ((drawctxt->base.flags & KGSL_CONTEXT_CTX_SWITCH) \|\|
		(cmdbatch->flags & KGSL_CONTEXT_CTX_SWITCH))
		set_bit(CMDBATCH_FLAG_FORCE_PREAMBLE, &cmdbatch->priv);

		/*
		* If we are waiting for the end of frame and it hasn't appeared yet,
		* then mark the command batch as skipped. It will still progress

+1 −0

Original line number	Diff line number	Diff line
		@@ -424,6 +424,7 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv,
		KGSL_CONTEXT_PER_CONTEXT_TS \|
		KGSL_CONTEXT_USER_GENERATED_TS \|
		KGSL_CONTEXT_NO_FAULT_TOLERANCE \|
		KGSL_CONTEXT_CTX_SWITCH \|
		KGSL_CONTEXT_TYPE_MASK);

		/* Always enable per-context timestamps */