A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: kgsl: Remove the extra recovery hop"

Browse source
This commit is contained in:
qctecmdr 2020-03-02 11:58:08 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1dc2d12bba
2 changed files with 20 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/msm/kgsl_gmu.c
View file

@ -1522,6 +1522,9 @@ static int gmu_suspend(struct kgsl_device *device)
regulator_set_mode(gmu->cx_gdsc, REGULATOR_MODE_NORMAL);
dev_err(&gmu->pdev->dev, "Suspended GMU\n");
clear_bit(GMU_FAULT, &device->gmu_core.flags);
return 0;
}

70
drivers/gpu/msm/kgsl_pwrctrl.c
View file

@ -1804,7 +1804,6 @@ static int
_aware(struct kgsl_device *device)
{
int status = 0;
unsigned int state = device->state;
switch (device->state) {
case KGSL_STATE_RESET:
@ -1832,65 +1831,23 @@ _aware(struct kgsl_device *device)
kgsl_pwrscale_midframe_timer_cancel(device);
break;
case KGSL_STATE_SLUMBER:
/* if GMU already in FAULT */
if (gmu_core_isenabled(device) &&
test_bit(GMU_FAULT, &device->gmu_core.flags)) {
status = -EINVAL;
break;
}
status = kgsl_pwrctrl_enable(device);
if (status && gmu_core_isenabled(device))
/*
* SLUMBER -> AWARE failed which means GMU boot failed.
* Make sure we reset the GMU while transitioning back
* to SLUMBER.
*/
kgsl_pwrctrl_set_state(device, KGSL_STATE_RESET);
break;
default:
status = -EINVAL;
}
if (status) {
if (gmu_core_isenabled(device)) {
/* GMU hang recovery */
kgsl_pwrctrl_set_state(device, KGSL_STATE_RESET);
set_bit(GMU_FAULT, &device->gmu_core.flags);
status = kgsl_pwrctrl_enable(device);
/* Cannot recover GMU failure GPU will not power on */
if (WARN_ONCE(status, "Failed to recover GMU\n")) {
if (device->snapshot)
device->snapshot->recovered = false;
/*
* On recovery failure, we are clearing
* GMU_FAULT bit and also not keeping
* the state as RESET to make sure any
* attempt to wake GMU/GPU after this
* is treated as a fresh start. But on
* recovery failure, GMU HS, clocks and
* IRQs are still ON/enabled because of
* which next GMU/GPU wakeup results in
* multiple warnings from GMU start as HS,
* clocks and IRQ were ON while doing a
* fresh start i.e. wake from SLUMBER.
*
* Suspend the GMU on recovery failure
* to make sure next attempt to wake up
* GMU/GPU is indeed a fresh start.
*/
kgsl_pwrctrl_irq(device, KGSL_PWRFLAGS_OFF);
gmu_core_suspend(device);
kgsl_pwrctrl_set_state(device, state);
} else {
if (device->snapshot)
device->snapshot->recovered = true;
kgsl_pwrctrl_set_state(device,
KGSL_STATE_AWARE);
}
clear_bit(GMU_FAULT, &device->gmu_core.flags);
return status;
}
kgsl_pwrctrl_request_state(device, KGSL_STATE_NONE);
} else {
if (!status)
kgsl_pwrctrl_set_state(device, KGSL_STATE_AWARE);
}
return status;
}
@ -1967,6 +1924,13 @@ _slumber(struct kgsl_device *device)
kgsl_pwrctrl_disable(device);
kgsl_pwrctrl_set_state(device, KGSL_STATE_SLUMBER);
break;
case KGSL_STATE_RESET:
if (gmu_core_isenabled(device)) {
/* Reset the GMU if we failed to boot the GMU */
gmu_core_suspend(device);
kgsl_pwrctrl_set_state(device, KGSL_STATE_SLUMBER);
}
break;
default:
kgsl_pwrctrl_request_state(device, KGSL_STATE_NONE);
break;