Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (6396904b) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2952,6 +2952,8 @@ static void sde_encoder_virt_enable(struct drm_encoder *drm_enc)
		"input handler registration failed, rc = %d\n", ret);
		}

		sde_enc->delayed_off_work.work.worker = NULL;

		ret = sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_KICKOFF);
		if (ret) {
		SDE_ERROR_ENC(sde_enc, "sde resource control failed: %d\n",

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

+26 −26

Original line number	Diff line number	Diff line
		@@ -3036,6 +3036,32 @@ static int sde_kms_hw_init(struct msm_kms *kms)

		sde_kms->splash_data.resource_handoff_pending = true;

		/* initialize power domain if defined */
		if (of_find_property(dev->dev->of_node, "#power-domain-cells", NULL)) {
		sde_kms->genpd.name = dev->unique;
		sde_kms->genpd.power_off = sde_kms_pd_disable;
		sde_kms->genpd.power_on = sde_kms_pd_enable;

		rc = pm_genpd_init(&sde_kms->genpd, NULL, true);
		if (rc < 0) {
		SDE_ERROR("failed to init genpd provider %s: %d\n",
		sde_kms->genpd.name, rc);
		goto genpd_err;
		}

		rc = of_genpd_add_provider_simple(dev->dev->of_node,
		&sde_kms->genpd);
		if (rc < 0) {
		SDE_ERROR("failed to add genpd provider %s: %d\n",
		sde_kms->genpd.name, rc);
		pm_genpd_remove(&sde_kms->genpd);
		goto genpd_err;
		}

		sde_kms->genpd_init = true;
		SDE_DEBUG("added genpd provider %s\n", sde_kms->genpd.name);
		}

		rc = _sde_kms_mmu_init(sde_kms);
		if (rc) {
		SDE_ERROR("sde_kms_mmu_init failed: %d\n", rc);
		@@ -3144,32 +3170,6 @@ static int sde_kms_hw_init(struct msm_kms *kms)
		SDE_POWER_EVENT_PRE_DISABLE,
		sde_kms_handle_power_event, sde_kms, "kms");

		/* initialize power domain if defined */
		if (of_find_property(dev->dev->of_node, "#power-domain-cells", NULL)) {
		sde_kms->genpd.name = dev->unique;
		sde_kms->genpd.power_off = sde_kms_pd_disable;
		sde_kms->genpd.power_on = sde_kms_pd_enable;

		rc = pm_genpd_init(&sde_kms->genpd, NULL, true);
		if (rc < 0) {
		SDE_ERROR("failed to init genpd provider %s: %d\n",
		sde_kms->genpd.name, rc);
		goto genpd_err;
		}

		rc = of_genpd_add_provider_simple(dev->dev->of_node,
		&sde_kms->genpd);
		if (rc < 0) {
		SDE_ERROR("failed to add genpd provider %s: %d\n",
		sde_kms->genpd.name, rc);
		pm_genpd_remove(&sde_kms->genpd);
		goto genpd_err;
		}

		sde_kms->genpd_init = true;
		SDE_DEBUG("added genpd provider %s\n", sde_kms->genpd.name);
		}

		if (sde_kms->splash_data.cont_splash_en) {
		SDE_DEBUG("Skipping MDP Resources disable\n");
		} else {