Merge "msm: kgsl: Avoid spin lock recursion in adreno_drawctxt_dump" (0c3ada08) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/adreno_drawctxt.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,12 @@ void adreno_drawctxt_dump(struct kgsl_device *device,
		kgsl_readtimestamp(device, context, KGSL_TIMESTAMP_CONSUMED, &start);
		kgsl_readtimestamp(device, context, KGSL_TIMESTAMP_RETIRED, &retire);

		spin_lock(&drawctxt->lock);
		/*
		* We may have cmdbatch timer running, which also uses same
		* lock, take a lock with software interrupt disabled (bh)
		* to avoid spin lock recursion.
		*/
		spin_lock_bh(&drawctxt->lock);
		dev_err(device->dev,
		" context[%d]: queue=%d, submit=%d, start=%d, retire=%d\n",
		context->id, queue, drawctxt->submitted_timestamp,
		@@ -108,7 +113,7 @@ stats:
		dev_err(device->dev, " context[%d]: submit times: %s\n",
		context->id, buf);

		spin_unlock(&drawctxt->lock);
		spin_unlock_bh(&drawctxt->lock);
		}

		/**