diff options
| author | Alan Cox | 2011-07-15 18:35:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-15 19:05:08 +0200 |
| commit | 3caa89e933646263cb4efedd5660dba00a107b51 (patch) | |
| tree | 79fc0790523e21665c231244ea1855b51c9d9f12 /drivers/staging/gma500/psb_drv.h | |
| parent | gma500: Use the mrst helpers and power control for mode commit (diff) | |
| download | kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.tar.gz kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.tar.xz kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.zip | |
gma500: resync with Medfield progress
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_drv.h')
| -rw-r--r-- | drivers/staging/gma500/psb_drv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h index 194c64fb6c68..72f487a2a1b7 100644 --- a/drivers/staging/gma500/psb_drv.h +++ b/drivers/staging/gma500/psb_drv.h @@ -31,6 +31,7 @@ #include "gtt.h" #include "power.h" #include "mrst.h" +#include "medfield.h" /* Append new drm mode definition here, align with libdrm definition */ #define DRM_MODE_SCALE_NO_SCALE 2 @@ -216,8 +217,8 @@ enum { #define MDFLD_DSR_OVERLAY_0 (1 << 4) #define MDFLD_DSR_OVERLAY_2 (1 << 5) #define MDFLD_DSR_MIPI_CONTROL (1 << 6) -#define MDFLD_DSR_DAMAGE_MASK_0 (1 << 0) | (1 << 2) | (1 << 4) -#define MDFLD_DSR_DAMAGE_MASK_2 (1 << 1) | (1 << 3) | (1 << 5) +#define MDFLD_DSR_DAMAGE_MASK_0 ((1 << 0) | (1 << 2) | (1 << 4)) +#define MDFLD_DSR_DAMAGE_MASK_2 ((1 << 1) | (1 << 3) | (1 << 5)) #define MDFLD_DSR_2D_3D (MDFLD_DSR_2D_3D_0 | MDFLD_DSR_2D_3D_2) #define MDFLD_DSR_RR 45 @@ -605,7 +606,7 @@ struct drm_psb_private { uint32_t dsr_idle_count; bool is_in_idle; bool dsr_enable; - void (*exit_idle)(struct drm_device *dev, u32 update_src, void *p_surfaceAddr, bool check_hw_on_only); + void (*exit_idle)(struct drm_device *dev, u32 update_src); /* 2D acceleration */ struct mutex mutex_2d; |