From: Alan Cox Date: Wed, 30 Mar 2011 09:00:23 +0000 (+0100) Subject: staging: gma500: enable Moorestown CRTC handling X-Git-Tag: v3.0-rc1~336^2~847 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e68e8c711b58646c129383828c4ccc49f3b3d6cf;p=karo-tx-linux.git staging: gma500: enable Moorestown CRTC handling Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 92b423dd3d3d..d24d0bf8be5a 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 */