diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-05 15:39:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 08:20:41 -0700 |
| commit | 71138b7f0735d277f71f0d7ba1918c8922f12cce (patch) | |
| tree | 50b9f0083f0248d6a6444db64f61dcc2e8c4ec92 /drivers/staging/gma500/psb_intel_display.c | |
| parent | 060351f17401937d65232100405888e7f16d4f4f (diff) | |
| download | op-kernel-dev-71138b7f0735d277f71f0d7ba1918c8922f12cce.zip op-kernel-dev-71138b7f0735d277f71f0d7ba1918c8922f12cce.tar.gz | |
gma500: enable Medfield CRTC support
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 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index ac0d9da..907c68e 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -29,6 +29,7 @@ #include "psb_intel_display.h" #include "psb_powermgmt.h" +#include "mdfld_output.h" struct psb_intel_clock_t { /* given values */ @@ -1303,12 +1304,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, return; } -#if 0 /* FIXME */ if (IS_MFLD(dev)) drm_crtc_init(dev, &psb_intel_crtc->base, - &mfld_intel_crtc_funcs); + &mdfld_intel_crtc_funcs); else -#endif drm_crtc_init(dev, &psb_intel_crtc->base, &psb_intel_crtc_funcs); @@ -1336,9 +1335,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, if (IS_MRST(dev)) drm_crtc_helper_add(&psb_intel_crtc->base, &mrst_helper_funcs); -/* else if (IS_MDFLD(dev)) + else if (IS_MFLD(dev)) drm_crtc_helper_add(&psb_intel_crtc->base, - &mfld_helper_funcs); */ + &mdfld_helper_funcs); else drm_crtc_helper_add(&psb_intel_crtc->base, &psb_intel_helper_funcs); |
