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

Commit 251db4b6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5cf1bae5 on remote branch 

Change-Id: Idaa54077cbd6d373f8692e5b963d0933efb7e444
parents 6104617f 5cf1bae5

msm/dsi/dsi_panel.c

+4 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel) 
{

	int rc = 0;



	if (panel->is_twm_en) {

	if (panel->is_twm_en || panel->skip_panel_off) {

		DSI_DEBUG("TWM Enabled, skip panel power off\n");

		return rc;

	}
@@ -2085,6 +2085,9 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel) 
	panel->reset_gpio_always_on = utils->read_bool(utils->data,

			"qcom,platform-reset-gpio-always-on");



	panel->skip_panel_off = utils->read_bool(utils->data,

			"qcom,skip-panel-power-off");



	panel->spr_info.enable = false;

	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;

msm/dsi/dsi_panel.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct dsi_panel { 
	atomic_t esd_recovery_pending;



	bool is_twm_en;

	bool skip_panel_off;

	bool panel_initialized;

	bool te_using_watchdog_timer;

	struct dsi_qsync_capabilities qsync_caps;

msm/sde/sde_encoder.c

+4 −1
Original line number Diff line number Diff line
@@ -141,7 +141,10 @@ void sde_encoder_uidle_enable(struct drm_encoder *drm_enc, bool enable) 
	for (i = 0; i < sde_enc->num_phys_encs; i++) {

		struct sde_encoder_phys *phys = sde_enc->phys_encs[i];



		if (phys && phys->hw_ctl && phys->hw_ctl->ops.uidle_enable) {

		if (phys && phys->hw_ctl && phys->hw_ctl->ops.uidle_enable &&

				phys->split_role != ENC_ROLE_SLAVE) {

			if (enable)

				SDE_EVT32(DRMID(drm_enc), enable);

			phys->hw_ctl->ops.uidle_enable(phys->hw_ctl, enable);

		}

	}