diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-05 15:44:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 08:20:44 -0700 |
| commit | 93b68b67739d40346756fe9b7423f084a1b22bce (patch) | |
| tree | 333cd6f2505a5f476db9040b5824a13126edcb52 /drivers/staging/gma500/framebuffer.c | |
| parent | 4bc5925315cee9b9f3d2b07dc8b692978be1d418 (diff) | |
gma500: begin adding CDV specific code
A lot of the intel_display stuff is duplicated, but we will add it first,
clean it up and then investigate the best way to merge stuff.
This first block integrates the various basic chunks of the CDV display setup.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/framebuffer.c')
| -rw-r--r-- | drivers/staging/gma500/framebuffer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/staging/gma500/framebuffer.c b/drivers/staging/gma500/framebuffer.c index 716a7b97930..c6dd4d828b5 100644 --- a/drivers/staging/gma500/framebuffer.c +++ b/drivers/staging/gma500/framebuffer.c @@ -732,6 +732,10 @@ static void psb_setup_outputs(struct drm_device *dev) /* valid crtcs */ switch (psb_intel_output->type) { + case INTEL_OUTPUT_ANALOG: + crtc_mask = (1 << 0); + clone_mask = (1 << INTEL_OUTPUT_ANALOG); + break; case INTEL_OUTPUT_SDVO: crtc_mask = ((1 << 0) | (1 << 1)); clone_mask = (1 << INTEL_OUTPUT_SDVO); @@ -752,7 +756,10 @@ static void psb_setup_outputs(struct drm_device *dev) clone_mask = (1 << INTEL_OUTPUT_MIPI2); break; case INTEL_OUTPUT_HDMI: - crtc_mask = (1 << 1); + if (IS_MFLD(dev)) + crtc_mask = (1 << 1); + else /* FIXME: review Oaktrail */ + crtc_mask = (1 << 0); /* Cedarview */ clone_mask = (1 << INTEL_OUTPUT_HDMI); break; } |