diff options
| author | Navid Bahrani <nbahrani@codeaurora.org> | 2018-04-20 14:25:51 -0700 |
|---|---|---|
| committer | Navid Bahrani <nbahrani@codeaurora.org> | 2018-04-20 14:25:51 -0700 |
| commit | b0b537aaca09b87608afe75c7e562fd6d16e3ba5 (patch) | |
| tree | f7982ca147d6ec2960624edee7212f84d1bfff1e /drivers/gpu | |
| parent | ace014f81d7b6e900f9137313e6356ff803d52dc (diff) | |
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: Navid Bahrani <nbahrani@codeaurora.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c index 21b89663a9c3..f79adf8fd9a0 100644 --- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c +++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c @@ -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); diff --git a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c index 8b399e02ec0c..b76aab3926ed 100644 --- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c @@ -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) |