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

Commit b0b537aa authored by Navid Bahrani's avatar Navid Bahrani
Browse files

drm/msm/hdmi: partial revert for hdmi->power_on changes 



hdmi->power_on is not properly set for pluggable platforms
leading to an incorrect return value from cable_status() call.
This partially reverts some changes from two previous commits
touching hdmi->power_on

Change-Id: Icd2d331eaed72950ab027424aaf9e1e6b901a205
Signed-off-by: default avatarNavid Bahrani <nbahrani@codeaurora.org>
parent ace014f8

drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c

+0 −2
Original line number Diff line number Diff line
@@ -3256,8 +3256,6 @@ int sde_hdmi_drm_init(struct sde_hdmi *display, struct drm_encoder *enc) 
	if (sde_kms->splash_info.handoff) {

		sde_hdmi_bridge_power_on(hdmi->bridge);

		hdmi->power_on = true;

	} else {

		hdmi->power_on = false;

	}



	mutex_unlock(&display->display_lock);

drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ static void _sde_hdmi_bridge_pre_enable(struct drm_bridge *bridge) 


	if (!hdmi->power_on) {

		_sde_hdmi_bridge_power_on(bridge);

		hdmi->power_on = true;

	}



	if (phy)