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

Commit d51be33c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix preemption fault handling for A6xx GPU"

parents 7caba938 296e0bb7

drivers/gpu/msm/adreno_a6xx_preempt.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void _a6xx_preemption_fault(struct adreno_device *adreno_dev) 
	if (kgsl_state_is_awake(device)) {

		adreno_readreg(adreno_dev, ADRENO_REG_CP_PREEMPT, &status);



		if (status == 0) {

		if (!(status & 0x1)) {

			adreno_set_preempt_state(adreno_dev,

				ADRENO_PREEMPT_COMPLETE);
@@ -155,7 +155,7 @@ static void _a6xx_preemption_fault(struct adreno_device *adreno_dev) 
	}



	dev_err(device->dev,

		     "Preemption timed out: cur=%d R/W=%X/%X, next=%d R/W=%X/%X\n",

		     "Preemption Fault: cur=%d R/W=0x%x/0x%x, next=%d R/W=0x%x/0x%x\n",

		     adreno_dev->cur_rb->id,

		     adreno_get_rptr(adreno_dev->cur_rb),

		     adreno_dev->cur_rb->wptr,