Merge "drm/msm/sde: continue with hw init if splash memory is not found" (9f71f5e8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_kms.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -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,6 +2797,11 @@ static int sde_kms_hw_init(struct msm_kms *kms)

		sde_dbg_init_dbg_buses(sde_kms->core_rev);

		/*
		* 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 */