joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "drm/msm/sde: continue with hw init if splash memory is not found"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-23 09:41:35 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9f71f5e8ac
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpu/drm/msm/sde/sde_kms.c
View file

@ -2673,6 +2673,7 @@ static int sde_kms_hw_init(struct msm_kms *kms)
struct sde_kms *sde_kms;
struct drm_device *dev;
struct msm_drm_private *priv;
bool splash_mem_found = false;
int i, rc = -EINVAL;
if (!kms) {
@ -2767,8 +2768,10 @@ static int sde_kms_hw_init(struct msm_kms *kms)
rc = _sde_kms_get_splash_data(&sde_kms->splash_data);
if (rc) {
SDE_ERROR("sde splash data fetch failed: %d\n", rc);
goto error;
SDE_DEBUG("sde splash data fetch failed: %d\n", rc);
splash_mem_found = false;
} else {
splash_mem_found = true;
}
rc = sde_power_resource_enable(&priv->phandle, sde_kms->core_client,
@ -2794,7 +2797,12 @@ static int sde_kms_hw_init(struct msm_kms *kms)
sde_dbg_init_dbg_buses(sde_kms->core_rev);
_sde_kms_cont_splash_res_init(sde_kms);
/*
* Attempt continuous splash handoff only if reserved
* splash memory is found.
*/
if (splash_mem_found)
_sde_kms_cont_splash_res_init(sde_kms);
/* Initialize reg dma block which is a singleton */
rc = sde_reg_dma_init(sde_kms->reg_dma, sde_kms->catalog,