diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-11-06 13:49:23 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-07 10:59:32 +1000 |
| commit | 39ec748f717460290424208d23879eadbf5ffb1c (patch) | |
| tree | a7ce1906f6f50e30d75467c06af81ac6d72ada7b /drivers/gpu/drm/gma500/oaktrail_crtc.c | |
| parent | 94baf0e27181c6a2f82cdbc5b960b197570e17de (diff) | |
| download | linux-stable-39ec748f717460290424208d23879eadbf5ffb1c.tar.gz linux-stable-39ec748f717460290424208d23879eadbf5ffb1c.tar.bz2 linux-stable-39ec748f717460290424208d23879eadbf5ffb1c.zip | |
gma600: Enable HDMI support
There are still some mysteries left, in particular how (and in
fact if) the EDID is supposed to work on the HDMI port. However
the basic stuff now works and I can plug my Q550 into an HDMI
display and get the expected results.
[v2: cleans up space/tab and other formatting as per Dave's
request]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/oaktrail_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c index cdafd2acc72f..4ec2962f7635 100644 --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c @@ -168,6 +168,11 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode) const struct psb_offset *map = &dev_priv->regmap[pipe]; u32 temp; + if (pipe == 1) { + oaktrail_crtc_hdmi_dpms(crtc, mode); + return; + } + if (!gma_power_begin(dev, true)) return; @@ -302,6 +307,9 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc, uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN; struct drm_connector *connector; + if (pipe == 1) + return oaktrail_crtc_hdmi_mode_set(crtc, mode, adjusted_mode, x, y, old_fb); + if (!gma_power_begin(dev, true)) return 0; |