Merge "msm: kgsl: Clear boot OOB in case GPU start fails"
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index bf62087..f6927e9 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -1851,7 +1851,7 @@
status = kgsl_mmu_start(device);
if (status)
- goto error_pwr_off;
+ goto error_boot_oob_clear;
_set_secvid(device);
@@ -2072,6 +2072,12 @@
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);