diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-06-24 16:20:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-06-24 16:20:19 +1000 |
| commit | 5b6345be1b41db5e70f90c3559c3b40c8abcde8b (patch) | |
| tree | fb72ccb8fa82d88c2a0e1c1a0301cfe8a67a3e6e /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 176f613e60b63f2d77e6c69f036cfc754f3aaac6 (diff) | |
| parent | b5aa8a0fc132dd512c33e7c2621d075e3b77a65e (diff) | |
| download | kernel_samsung_smdk4412-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.zip kernel_samsung_smdk4412-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.gz kernel_samsung_smdk4412-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.bz2 | |
Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7a84f04..bb4c2d3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -306,6 +306,17 @@ typedef struct drm_i915_private { u32 saveCURBPOS; u32 saveCURBBASE; u32 saveCURSIZE; + u32 saveDP_B; + u32 saveDP_C; + u32 saveDP_D; + u32 savePIPEA_GMCH_DATA_M; + u32 savePIPEB_GMCH_DATA_M; + u32 savePIPEA_GMCH_DATA_N; + u32 savePIPEB_GMCH_DATA_N; + u32 savePIPEA_DP_LINK_M; + u32 savePIPEB_DP_LINK_M; + u32 savePIPEA_DP_LINK_N; + u32 savePIPEB_DP_LINK_N; struct { struct drm_mm gtt_space; @@ -857,6 +868,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define HAS_128_BYTE_Y_TILING(dev) (IS_I9XX(dev) && !(IS_I915G(dev) || \ IS_I915GM(dev))) #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev) || IS_IGDNG(dev)) +#define SUPPORTS_INTEGRATED_DP(dev) (IS_G4X(dev) || IS_IGDNG(dev)) #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) #define PRIMARY_RINGBUFFER_SIZE (128*1024) |