Merge "msm: kgsl: Set gmu fault inside gmu_snapshot" (4d4f6ede) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/msm/kgsl_gmu.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1554,6 +1554,10 @@ static void gmu_snapshot(struct kgsl_device *device)
		struct gmu_dev_ops *gmu_dev_ops = GMU_DEVICE_OPS(device);
		struct gmu_device *gmu = KGSL_GMU_DEVICE(device);

		/* Abstain from sending another nmi or over-writing snapshot */
		if (test_and_set_bit(GMU_FAULT, &device->gmu_core.flags))
		return;

		adreno_gmu_send_nmi(adreno_dev);
		/* Wait for the NMI to be handled */
		udelay(100);
		@@ -1726,12 +1730,6 @@ static void gmu_stop(struct kgsl_device *device)
		return;

		error:
		/*
		* The power controller will change state to SLUMBER anyway
		* Set GMU_FAULT flag to indicate to power contrller
		* that hang recovery is needed to power on GPU
		*/
		set_bit(GMU_FAULT, &device->gmu_core.flags);
		dev_err(&gmu->pdev->dev, "Failed to stop GMU\n");
		gmu_core_snapshot(device);
		/*