diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-03-30 10:00:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-05 11:27:45 -0700 |
| commit | e68e8c711b58646c129383828c4ccc49f3b3d6cf (patch) | |
| tree | 1019454a8a48951bdc52b6385303fa638fcafedd /drivers/staging/gma500 | |
| parent | 9ba06b5fabdfe23f3fe68b04fbe5928a38349bbf (diff) | |
| download | kernel_samsung_smdk4412-e68e8c711b58646c129383828c4ccc49f3b3d6cf.zip kernel_samsung_smdk4412-e68e8c711b58646c129383828c4ccc49f3b3d6cf.tar.gz kernel_samsung_smdk4412-e68e8c711b58646c129383828c4ccc49f3b3d6cf.tar.bz2 | |
staging: gma500: enable Moorestown CRTC handling
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_intel_display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 92b423d..d24d0bf 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -569,9 +569,7 @@ 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 */ - if (!IS_MRST(dev)) - return 1; - return (pfit_control >> 29) & 3; + return 1; } static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, @@ -1395,7 +1393,11 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, psb_intel_crtc->mode_dev = mode_dev; psb_intel_crtc->cursor_addr = 0; - drm_crtc_helper_add(&psb_intel_crtc->base, + if (IS_MRST(dev)) + drm_crtc_helper_add(&psb_intel_crtc->base, + &mrst_helper_funcs); + else + drm_crtc_helper_add(&psb_intel_crtc->base, &psb_intel_helper_funcs); /* Setup the array of drm_connector pointer array */ |