diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-03-30 09:59:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-05 11:27:41 -0700 |
| commit | 2627aaa6795753e787e544bbc8be60e38e0b08e6 (patch) | |
| tree | 51ac68eac17eaf31a3877f84065b40f6d3f6c9de /drivers/staging/gma500/psb_intel_display.c | |
| parent | 427beeb21ad0b4297657d578003b2eb3803f95c9 (diff) | |
| download | op-kernel-dev-2627aaa6795753e787e544bbc8be60e38e0b08e6.zip op-kernel-dev-2627aaa6795753e787e544bbc8be60e38e0b08e6.tar.gz | |
staging: gma500: begin adding Moorestown support
The Moorestown systems have some graphics differences we care about and some
we don't need to.
To start with it has a single pipe and that pipe can be used for LVDS
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_intel_display.c')
| -rw-r--r-- | drivers/staging/gma500/psb_intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 80b37f4..917d37e 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -569,7 +569,9 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev) if ((pfit_control & PFIT_ENABLE) == 0) return -1; /* Must be on PIPE 1 for PSB */ - return 1; + if (!IS_MRST(dev)) + return 1; + return (pfit_control >> 29) & 3; } static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, |
