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

Commit f64d68db 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: Do not crash on context detach timeout failure"

parents 414ca5e6 28b9efd9

drivers/gpu/msm/adreno.h

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ enum adreno_gpurev { 
#define ADRENO_IOMMU_PAGE_FAULT BIT(3)

#define ADRENO_PREEMPT_FAULT BIT(4)

#define ADRENO_GMU_FAULT BIT(5)

#define ADRENO_CTX_DETATCH_TIMEOUT_FAULT BIT(6)



#define ADRENO_SPTP_PC_CTRL 0

#define ADRENO_PPD_CTRL     1

drivers/gpu/msm/adreno_dispatch.c

+2 −1
Original line number Diff line number Diff line
@@ -1836,7 +1836,8 @@ static void process_cmdobj_fault(struct kgsl_device *device, 
	 * because we won't see this cmdobj again

	 */



	if (fault & ADRENO_TIMEOUT_FAULT)

	if ((fault & ADRENO_TIMEOUT_FAULT) ||

				(fault & ADRENO_CTX_DETATCH_TIMEOUT_FAULT))

		bitmap_zero(&cmdobj->fault_policy, BITS_PER_LONG);



	/*

drivers/gpu/msm/adreno_drawctxt.c

+24 −11
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ void adreno_drawctxt_invalidate(struct kgsl_device *device, 
	/* Give the bad news to everybody waiting around */

	wake_up_all(&drawctxt->waiting);

	wake_up_all(&drawctxt->wq);

	wake_up_all(&drawctxt->timeout);

}



/*
@@ -398,6 +399,7 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, 
	spin_lock_init(&drawctxt->lock);

	init_waitqueue_head(&drawctxt->wq);

	init_waitqueue_head(&drawctxt->waiting);

	init_waitqueue_head(&drawctxt->timeout);



	/* Set the context priority */

	_set_context_priority(drawctxt);
@@ -520,21 +522,32 @@ void adreno_drawctxt_detach(struct kgsl_context *context) 
		drawctxt->internal_timestamp, 30 * 1000);



	/*

	 * If the wait for global fails due to timeout then nothing after this

	 * point is likely to work very well - Get GPU snapshot and BUG_ON()

	 * so we can take advantage of the debug tools to figure out what the

	 * h - e - double hockey sticks happened. If EAGAIN error is returned

	 * If the wait for global fails due to timeout then mark it as

	 * context detach timeout fault and schedule dispatcher to kick

	 * in GPU recovery. For a ADRENO_CTX_DETATCH_TIMEOUT_FAULT we clear

	 * the policy and invalidate the context. If EAGAIN error is returned

	 * then recovery will kick in and there will be no more commands in the

	 * RB pipe from this context which is waht we are waiting for, so ignore

	 * -EAGAIN error

	 * RB pipe from this context which is what we are waiting for, so ignore

	 * -EAGAIN error.

	 */

	if (ret && ret != -EAGAIN) {

		KGSL_DRV_ERR(device, "Wait for global ts=%d type=%d error=%d\n",

				drawctxt->internal_timestamp,

		KGSL_DRV_ERR(device,

				"Wait for global ctx=%d ts=%d type=%d error=%d\n",

				drawctxt->base.id, drawctxt->internal_timestamp,

				drawctxt->type, ret);

		device->force_panic = 1;

		kgsl_device_snapshot(device, context,

				adreno_gmu_gpu_fault(adreno_dev));



		adreno_set_gpu_fault(adreno_dev,

				ADRENO_CTX_DETATCH_TIMEOUT_FAULT);

		mutex_unlock(&device->mutex);



		/* Schedule dispatcher to kick in recovery */

		adreno_dispatcher_schedule(device);



		/* Wait for context to be invalidated and release context */

		wait_event_interruptible_timeout(drawctxt->timeout,

					kgsl_context_invalid(&drawctxt->base),

					msecs_to_jiffies(5000));

		return;

	}



	kgsl_sharedmem_writel(device, &device->memstore,

drivers/gpu/msm/adreno_drawctxt.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct kgsl_context; 
 * @pending: Priority list node for the dispatcher list of pending contexts

 * @wq: Workqueue structure for contexts to sleep pending room in the queue

 * @waiting: Workqueue structure for contexts waiting for a timestamp or event

 * @timeout: Workqueue structure for contexts waiting to invalidate

 * @queued: Number of commands queued in the drawqueue

 * @fault_policy: GFT fault policy set in _skip_cmd();

 * @debug_root: debugfs entry for this context.
@@ -68,6 +69,7 @@ struct adreno_context { 
	struct plist_node pending;

	wait_queue_head_t wq;

	wait_queue_head_t waiting;

	wait_queue_head_t timeout;



	int queued;

	unsigned int fault_policy;