diff options
| author | Stephane Viau <sviau@codeaurora.org> | 2015-06-19 23:04:47 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2015-08-16 01:27:13 +0300 |
| commit | 3a84f8469e2687b9fdcf83d615b8001a2443566a (patch) | |
| tree | 3bc762248c38a8d43b55ac16e95022f12f5c4acb /drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | |
| parent | da32855219f86f27cad1b12be2264ffb0b97b9fa (diff) | |
| download | linux-3a84f8469e2687b9fdcf83d615b8001a2443566a.tar.xz | |
drm/msm: Add support for msm8x94
This change adds the MDP and HDMI support for msm8x94.
Note that HDMI PHY registers are not being accessed anymore from
the driver.
Signed-off-by: Stephane Viau <sviau@codeaurora.org>
[rename compatible s/8x94/8994/ since preference is to not trust the
marketing folks who invent chip #'s but instead name things after the
lead chip.. we should rename some 80XY to 89XY to standardize on the
lead chip but leave that for another patch. Also, update dt bindings
doc]
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/hdmi/hdmi_bridge.c')
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c index 1dd093e3451c..92b69ae8caf9 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c @@ -100,7 +100,9 @@ static void hdmi_bridge_pre_enable(struct drm_bridge *bridge) hdmi_audio_update(hdmi); } - phy->funcs->powerup(phy, hdmi->pixclock); + if (phy) + phy->funcs->powerup(phy, hdmi->pixclock); + hdmi_set_mode(hdmi, true); if (hdmi->hdcp_ctrl) @@ -126,7 +128,9 @@ static void hdmi_bridge_post_disable(struct drm_bridge *bridge) DBG("power down"); hdmi_set_mode(hdmi, false); - phy->funcs->powerdown(phy); + + if (phy) + phy->funcs->powerdown(phy); if (hdmi->power_on) { power_off(bridge); |