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

Commit bf3bda0f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 6b0ad761 b0b537aa

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

+0 −2
Original line number Diff line number Diff line
@@ -3254,8 +3254,6 @@ int sde_hdmi_drm_init(struct sde_hdmi *display, struct drm_encoder *enc) 
	if (display->cont_splash_enabled) {

		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)