Merge "msm: kgsl: Clear boot OOB in case GPU start fails" (aa590c3c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1851,7 +1851,7 @@ static int _adreno_start(struct adreno_device *adreno_dev)

		status = kgsl_mmu_start(device);
		if (status)
		goto error_pwr_off;
		goto error_boot_oob_clear;

		_set_secvid(device);

		@@ -2072,6 +2072,12 @@ static int _adreno_start(struct adreno_device *adreno_dev)
		error_mmu_off:
		kgsl_mmu_stop(&device->mmu);

		error_boot_oob_clear:
		if (gpudev->oob_clear &&
		ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_HFI_USE_REG))
		gpudev->oob_clear(adreno_dev,
		OOB_BOOT_SLUMBER_CLEAR_MASK);

		error_pwr_off:
		/* set the state back to original state */
		kgsl_pwrctrl_change_state(device, state);