Merge "drm/msm/sde: avoid disabling clks/bw when cont-splash is enabled" into msm-4.14 (0f2330d9) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4094,6 +4094,7 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg)

	static void sde_crtc_disable(struct drm_crtc *crtc)		static void sde_crtc_disable(struct drm_crtc *crtc)
	{		{
			struct sde_kms *sde_kms;
	struct sde_crtc *sde_crtc;		struct sde_crtc *sde_crtc;
	struct sde_crtc_state *cstate;		struct sde_crtc_state *cstate;
	struct drm_encoder *encoder;		struct drm_encoder *encoder;
	@@ -4109,6 +4110,12 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
	return;		return;
	}		}

			sde_kms = _sde_crtc_get_kms(crtc);
			if (!sde_kms) {
			SDE_ERROR("invalid kms\n");
			return;
			}

	if (!sde_kms_power_resource_is_enabled(crtc->dev)) {		if (!sde_kms_power_resource_is_enabled(crtc->dev)) {
	SDE_ERROR("power resource is not enabled\n");		SDE_ERROR("power resource is not enabled\n");
	return;		return;
	@@ -4174,6 +4181,8 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
	}		}
	spin_unlock_irqrestore(&sde_crtc->spin_lock, flags);		spin_unlock_irqrestore(&sde_crtc->spin_lock, flags);

			/* avoid clk/bw downvote if cont-splash is enabled */
			if (!sde_kms->splash_data.cont_splash_en)
	sde_core_perf_crtc_update(crtc, 0, true);		sde_core_perf_crtc_update(crtc, 0, true);

	drm_for_each_encoder(encoder, crtc->dev) {		drm_for_each_encoder(encoder, crtc->dev) {