Skip to content

Commit

Permalink
staging: gma500: add framebuffer setup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent a7cf87e commit 9ba06b5
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions drivers/staging/gma500/psb_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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:
Expand Down

0 comments on commit 9ba06b5

Please sign in to comment.