diff options
| author | Alan Cox | 2011-03-30 11:00:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-05 20:27:45 +0200 |
| commit | 9ba06b5fabdfe23f3fe68b04fbe5928a38349bbf (patch) | |
| tree | 56ed536420e9ae1afed6b740b92ed13b3c876ed9 /drivers/staging/gma500 | |
| parent | staging: gma500: Add Moorestown backlight support (diff) | |
| download | kernel-qcow2-linux-9ba06b5fabdfe23f3fe68b04fbe5928a38349bbf.tar.gz kernel-qcow2-linux-9ba06b5fabdfe23f3fe68b04fbe5928a38349bbf.tar.xz kernel-qcow2-linux-9ba06b5fabdfe23f3fe68b04fbe5928a38349bbf.zip | |
staging: gma500: add framebuffer setup
For Moorestown we want to use the mrst LVDS setup not the Poulsbo setup
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
| -rw-r--r-- | drivers/staging/gma500/psb_fb.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/psb_fb.c index 4e5d8a6b7e26..53a270e5857b 100644 --- a/drivers/staging/gma500/psb_fb.c +++ b/drivers/staging/gma500/psb_fb.c @@ -698,8 +698,16 @@ static void psb_setup_outputs(struct drm_device *dev) psb_create_backlight_property(dev); - psb_intel_lvds_init(dev, &dev_priv->mode_dev); - /* psb_intel_sdvo_init(dev, SDVOB); */ + if (IS_MRST(dev)) { + if (dev_priv->iLVDS_enable) + mrst_lvds_init(dev, &dev_priv->mode_dev); + else + DRM_ERROR("DSI is not supported\n"); + } else { + /* FIXME: check if SDVO init should be re-enabled */ + psb_intel_lvds_init(dev, &dev_priv->mode_dev); + /* psb_intel_sdvo_init(dev, SDVOB); */ + } list_for_each_entry(connector, &dev->mode_config.connector_list, head) { @@ -717,10 +725,9 @@ static void psb_setup_outputs(struct drm_device *dev) case INTEL_OUTPUT_LVDS: PSB_DEBUG_ENTRY("LVDS.\n"); if (IS_MRST(dev)) - crtc_mask = (1 << 0); - else - crtc_mask = (1 << 1); - + crtc_mask = (1 << 0); + else + crtc_mask = (1 << 1); clone_mask = (1 << INTEL_OUTPUT_LVDS); break; case INTEL_OUTPUT_MIPI: |