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

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

Merge "msm: kgsl: Trigger GMU recovery on OOB set failures"

parents d2198689 fc01aee1

drivers/gpu/msm/adreno.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -1871,9 +1871,12 @@ static inline int adreno_perfcntr_active_oob_get( 




	if (GMU_DEV_OP_VALID(gmu_dev_ops, oob_set)) {

	if (GMU_DEV_OP_VALID(gmu_dev_ops, oob_set)) {

		ret = gmu_dev_ops->oob_set(adreno_dev, oob_perfcntr);

		ret = gmu_dev_ops->oob_set(adreno_dev, oob_perfcntr);

		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));

			kgsl_active_count_put(KGSL_DEVICE(adreno_dev));

		}

		}

	}





	return ret;

	return ret;

}

}

drivers/gpu/msm/adreno_a6xx_preempt.c

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




		if (GMU_DEV_OP_VALID(gmu_dev_ops, oob_set)) {

		if (GMU_DEV_OP_VALID(gmu_dev_ops, oob_set)) {

			status = gmu_dev_ops->oob_set(adreno_dev, oob_preempt);

			status = gmu_dev_ops->oob_set(adreno_dev, oob_preempt);

			if (status)

			if (status) {

				adreno_set_gpu_fault(adreno_dev,

					ADRENO_GMU_FAULT);

				adreno_dispatcher_schedule(

					KGSL_DEVICE(adreno_dev));

				return;

				return;

			}

			}

		}

		}

	}









	spin_lock_irqsave(&rb->preempt_lock, flags);

	spin_lock_irqsave(&rb->preempt_lock, flags);