Merge "msm: kgsl: Fix HFI start failed on SA8155"

This commit is contained in:
qctecmdr 2020-08-18 14:18:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit ba763c41c2
2 changed files with 10 additions and 8 deletions

View file

@ -2192,6 +2192,15 @@ static int a6xx_gmu_first_boot(struct adreno_device *adreno_dev)
goto err;
}
if (!test_bit(GMU_PRIV_PDC_RSC_LOADED, &gmu->flags)) {
ret = a6xx_load_pdc_ucode(adreno_dev);
if (ret)
goto err;
a6xx_load_rsc_ucode(adreno_dev);
set_bit(GMU_PRIV_PDC_RSC_LOADED, &gmu->flags);
}
ret = a6xx_gmu_hfi_start(adreno_dev);
if (ret)
goto err;
@ -2988,14 +2997,6 @@ static int a6xx_first_boot(struct adreno_device *adreno_dev)
if (ret)
return ret;
ret = a6xx_load_pdc_ucode(adreno_dev);
if (ret) {
a6xx_gmu_power_off(adreno_dev);
return ret;
}
a6xx_load_rsc_ucode(adreno_dev);
adreno_get_bus_counters(adreno_dev);
adreno_dev->cooperative_reset = ADRENO_FEATURE(adreno_dev,

View file

@ -137,6 +137,7 @@ enum {
GMU_PRIV_HFI_STARTED,
GMU_PRIV_RSCC_SLEEP_DONE,
GMU_PRIV_PM_SUSPEND,
GMU_PRIV_PDC_RSC_LOADED,
};
/**