diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-04 16:11:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-04 16:11:21 -0700 |
| commit | bf3bda0f81490d2e243b898cc4348d8cff0b7063 (patch) | |
| tree | e05b4c846c79351f53e651c6ae869fb5da7992fc /drivers/gpu/drm | |
| parent | 6b0ad7611a9a7d43b72e4fe65d830f3b69928979 (diff) | |
| parent | b0b537aaca09b87608afe75c7e562fd6d16e3ba5 (diff) | |
Merge "drm/msm/hdmi: partial revert for hdmi->power_on changes"
Diffstat (limited to 'drivers/gpu/drm')
| -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 852ac80410f0..7815c169ec3e 100644 --- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c +++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c @@ -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); 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) |