Commit 9ba06b5f authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

staging: gma500: add framebuffer setup

For Moorestown we want to use the mrst LVDS setup not the Poulsbo setup
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a7cf87e6
...@@ -698,8 +698,16 @@ static void psb_setup_outputs(struct drm_device *dev) ...@@ -698,8 +698,16 @@ static void psb_setup_outputs(struct drm_device *dev)
psb_create_backlight_property(dev); psb_create_backlight_property(dev);
psb_intel_lvds_init(dev, &dev_priv->mode_dev); if (IS_MRST(dev)) {
/* psb_intel_sdvo_init(dev, SDVOB); */ 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, list_for_each_entry(connector, &dev->mode_config.connector_list,
head) { head) {
...@@ -717,10 +725,9 @@ static void psb_setup_outputs(struct drm_device *dev) ...@@ -717,10 +725,9 @@ static void psb_setup_outputs(struct drm_device *dev)
case INTEL_OUTPUT_LVDS: case INTEL_OUTPUT_LVDS:
PSB_DEBUG_ENTRY("LVDS.\n"); PSB_DEBUG_ENTRY("LVDS.\n");
if (IS_MRST(dev)) if (IS_MRST(dev))
crtc_mask = (1 << 0); crtc_mask = (1 << 0);
else else
crtc_mask = (1 << 1); crtc_mask = (1 << 1);
clone_mask = (1 << INTEL_OUTPUT_LVDS); clone_mask = (1 << INTEL_OUTPUT_LVDS);
break; break;
case INTEL_OUTPUT_MIPI: case INTEL_OUTPUT_MIPI:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment