diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-05 15:41:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 08:20:43 -0700 |
| commit | 0bbfa259ac9f678e3f3d1a7eb7f51d14840c6851 (patch) | |
| tree | a46d828d9b1891606aee8aff601fb5e21451e4d6 /drivers/staging/gma500/psb_irq.c | |
| parent | 63e21a5bfc97ba2552d7efbb09462b0946af1176 (diff) | |
| download | op-kernel-dev-0bbfa259ac9f678e3f3d1a7eb7f51d14840c6851.zip op-kernel-dev-0bbfa259ac9f678e3f3d1a7eb7f51d14840c6851.tar.gz | |
gma500: begin the config based split
We don't want to carry all the extra gunk around on every device so use the
splitting work so far to tidy this up. Poulsbo is still mandatory as it is
used in bits by the other drivers and not neatly modularised.
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_irq.c')
| -rw-r--r-- | drivers/staging/gma500/psb_irq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_irq.c b/drivers/staging/gma500/psb_irq.c index 3768cf1..8fc7070 100644 --- a/drivers/staging/gma500/psb_irq.c +++ b/drivers/staging/gma500/psb_irq.c @@ -455,11 +455,12 @@ int psb_enable_vblank(struct drm_device *dev, int pipe) uint32_t reg_val = 0; uint32_t pipeconf_reg = mid_pipeconf(pipe); +#if defined(CONFIG_DRM_PSB_MFLD) /* Medfield is different - we should perhaps extract out vblank and blacklight etc ops */ if (IS_MFLD(dev) && !mdfld_panel_dpi(dev)) return mdfld_enable_te(dev, pipe); - +#endif if (gma_power_begin(dev, false)) { reg_val = REG_READ(pipeconf_reg); gma_power_end(dev); @@ -486,8 +487,10 @@ void psb_disable_vblank(struct drm_device *dev, int pipe) struct drm_psb_private *dev_priv = dev->dev_private; unsigned long irqflags; +#if defined(CONFIG_DRM_PSB_MFLD) if (IS_MFLD(dev) && !mdfld_panel_dpi(dev)) mdfld_disable_te(dev, pipe); +#endif spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); mid_disable_pipe_event(dev_priv, pipe); |
