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

staging: gma500: enable Moorestown CRTC handling

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ba06b5f
...@@ -569,9 +569,7 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev) ...@@ -569,9 +569,7 @@ static int psb_intel_panel_fitter_pipe(struct drm_device *dev)
if ((pfit_control & PFIT_ENABLE) == 0) if ((pfit_control & PFIT_ENABLE) == 0)
return -1; return -1;
/* Must be on PIPE 1 for PSB */ /* Must be on PIPE 1 for PSB */
if (!IS_MRST(dev))
return 1; return 1;
return (pfit_control >> 29) & 3;
} }
static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
...@@ -1395,6 +1393,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, ...@@ -1395,6 +1393,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
psb_intel_crtc->mode_dev = mode_dev; psb_intel_crtc->mode_dev = mode_dev;
psb_intel_crtc->cursor_addr = 0; psb_intel_crtc->cursor_addr = 0;
if (IS_MRST(dev))
drm_crtc_helper_add(&psb_intel_crtc->base,
&mrst_helper_funcs);
else
drm_crtc_helper_add(&psb_intel_crtc->base, drm_crtc_helper_add(&psb_intel_crtc->base,
&psb_intel_helper_funcs); &psb_intel_helper_funcs);
......
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