Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ce2beb7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: update initial clock value for continuous splash"

parents 1de3132c 75f0dfad

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

+23 −4
Original line number Diff line number Diff line
@@ -6545,13 +6545,32 @@ static int sde_crtc_idle_interrupt_handler(struct drm_crtc *crtc_drm, 
}



/**

 * sde_crtc_update_cont_splash_mixer_settings - update mixer settings

 *	during device bootup for cont_splash use case

 * sde_crtc_update_cont_splash_settings - update mixer settings

 *	and initial clk during device bootup for cont_splash use case

 * @crtc: Pointer to drm crtc structure

 */

void sde_crtc_update_cont_splash_mixer_settings(

		struct drm_crtc *crtc)

void sde_crtc_update_cont_splash_settings(struct drm_crtc *crtc)

{

	struct sde_kms *kms = NULL;

	struct msm_drm_private *priv;

	struct sde_crtc *sde_crtc;



	if (!crtc || !crtc->state || !crtc->dev || !crtc->dev->dev_private) {

		SDE_ERROR("invalid crtc\n");

		return;

	}



	priv = crtc->dev->dev_private;

	kms = to_sde_kms(priv->kms);

	if (!kms || !kms->catalog) {

		SDE_ERROR("invalid parameters\n");

		return;

	}



	_sde_crtc_setup_mixers(crtc);

	crtc->enabled = true;



	/* update core clk value for initial state with cont-splash */

	sde_crtc = to_sde_crtc(crtc);

	sde_crtc->cur_perf.core_clk_rate = kms->perf.max_core_clk_rate;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -793,11 +793,11 @@ int sde_crtc_helper_reset_custom_properties(struct drm_crtc *crtc, 
void sde_crtc_timeline_status(struct drm_crtc *crtc);



/**

 * sde_crtc_update_cont_splash_mixer_settings - update mixer settings

 * sde_crtc_update_cont_splash_settings - update mixer settings

 *	during device bootup for cont_splash use case

 * @crtc: Pointer to drm crtc structure

 */

void sde_crtc_update_cont_splash_mixer_settings(

void sde_crtc_update_cont_splash_settings(

		struct drm_crtc *crtc);



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -2583,7 +2583,7 @@ static int sde_kms_cont_splash_config(struct msm_kms *kms) 
		sde_encoder_update_caps_for_cont_splash(encoder,

				splash_display, true);



		sde_crtc_update_cont_splash_mixer_settings(crtc);

		sde_crtc_update_cont_splash_settings(crtc);



		sde_conn = to_sde_connector(connector);

		if (sde_conn && sde_conn->ops.cont_splash_config)