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

Commit c1bd51e6 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: Trigger GMU recovery on OOB set failures"

parents 5c45c1a7 61384e67

drivers/gpu/msm/adreno.h

+4 −1
Original line number Diff line number Diff line
@@ -1873,9 +1873,12 @@ static inline int adreno_perfcntr_active_oob_get( 
		ret = gpudev->oob_set(adreno_dev, OOB_PERFCNTR_SET_MASK,

				OOB_PERFCNTR_CHECK_MASK,

				OOB_PERFCNTR_CLEAR_MASK);

		if (ret)

		if (ret) {

			adreno_set_gpu_fault(adreno_dev, ADRENO_GMU_FAULT);

			adreno_dispatcher_schedule(KGSL_DEVICE(adreno_dev));

			kgsl_active_count_put(KGSL_DEVICE(adreno_dev));

		}

	}



	return ret;

}

drivers/gpu/msm/adreno_a6xx_preempt.c

+6 −1
Original line number Diff line number Diff line
@@ -49,10 +49,15 @@ static void _update_wptr(struct adreno_device *adreno_dev, bool reset_timer) 
				OOB_PREEMPTION_SET_MASK,

				OOB_PREEMPTION_CHECK_MASK,

				OOB_PREEMPTION_CLEAR_MASK);

			if (status)

			if (status) {

				adreno_set_gpu_fault(adreno_dev,

					ADRENO_GMU_FAULT);

				adreno_dispatcher_schedule(

					KGSL_DEVICE(adreno_dev));

				return;

			}

		}

	}





	spin_lock_irqsave(&rb->preempt_lock, flags);