Merge "msm: kgsl: Save and restore the power ctrl_flags during recovery"

This commit is contained in:
qctecmdr 2020-08-26 20:58:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit d12f827442

View file

@ -1206,6 +1206,10 @@ static int a6xx_reset(struct kgsl_device *device)
{
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
int ret;
unsigned long flags = device->pwrctrl.ctrl_flags;
/* Clear ctrl_flags to ensure clocks and regulators are turned off */
device->pwrctrl.ctrl_flags = 0;
kgsl_pwrctrl_change_state(device, KGSL_STATE_INIT);
@ -1218,6 +1222,8 @@ static int a6xx_reset(struct kgsl_device *device)
kgsl_pwrctrl_change_state(device, KGSL_STATE_ACTIVE);
device->pwrctrl.ctrl_flags = flags;
/* Toggle GX CPR on demand */
a6xx_gx_cpr_toggle(device);