UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: gma500: enable Moorestown CRTC handling 

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-03-30 10:00:23 +01:00 committed by Greg Kroah-Hartman
parent 9ba06b5fab
commit e68e8c711b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/gma500/psb_intel_display.c
View File

@ -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,7 +1393,11 @@ 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;
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); &psb_intel_helper_funcs);
/* Setup the array of drm_connector pointer array */ /* Setup the array of drm_connector pointer array */