diff options
author | Shaohua Li <shaohua.li@intel.com> | 2009-06-25 23:23:55 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-07-01 14:16:09 -0400 |
commit | 7662c8bd6545c12ac7b2b39e4554c3ba34789c50 (patch) | |
tree | b6bd6bc9725e355cd7e57c3183dfba99af719a5e /drivers/gpu/drm/i915/i915_drv.h | |
parent | 63eeaf38251183ec2b1caee11e4a2c040cb5ce6c (diff) |
drm/i915: add FIFO watermark support
This patch from jbarnes and myself adds FIFO watermark control to the
driver. This is needed for both power saving features on new platforms
with the so-called "big FIFO" and for controlling FIFO allocation
between pipes in multi-head configurations.
It's also necessary infrastructure to support things like framebuffer
compression and configuration supportability checks (i.e. checking a
configuration against available bandwidth).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 596e119d3e0e..47ecb617e519 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -225,6 +225,8 @@ typedef struct drm_i915_private { | |||
225 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ | 225 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ |
226 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ | 226 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ |
227 | 227 | ||
228 | unsigned int fsb_freq, mem_freq; | ||
229 | |||
228 | spinlock_t error_lock; | 230 | spinlock_t error_lock; |
229 | struct drm_i915_error_state *first_error; | 231 | struct drm_i915_error_state *first_error; |
230 | 232 | ||
@@ -889,6 +891,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
889 | #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev) || IS_IGDNG(dev)) | 891 | #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev) || IS_IGDNG(dev)) |
890 | #define SUPPORTS_INTEGRATED_DP(dev) (IS_G4X(dev) || IS_IGDNG(dev)) | 892 | #define SUPPORTS_INTEGRATED_DP(dev) (IS_G4X(dev) || IS_IGDNG(dev)) |
891 | #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) | 893 | #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) |
894 | /* dsparb controlled by hw only */ | ||
895 | #define DSPARB_HWCONTROL(dev) (IS_G4X(dev)) | ||
892 | 896 | ||
893 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) | 897 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) |
894 | 898 | ||