aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ef1c0b8f8d07..0a4f39b9a0ec 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -47,6 +47,8 @@ enum pipe {
47 PIPE_B, 47 PIPE_B,
48}; 48};
49 49
50#define I915_NUM_PIPE 2
51
50/* Interface history: 52/* Interface history:
51 * 53 *
52 * 1.1: Original. 54 * 1.1: Original.
@@ -132,6 +134,7 @@ typedef struct drm_i915_private {
132 int user_irq_refcount; 134 int user_irq_refcount;
133 /** Cached value of IMR to avoid reads in updating the bitfield */ 135 /** Cached value of IMR to avoid reads in updating the bitfield */
134 u32 irq_mask_reg; 136 u32 irq_mask_reg;
137 u32 pipestat[2];
135 138
136 int tex_lru_log_granularity; 139 int tex_lru_log_granularity;
137 int allow_batchbuffer; 140 int allow_batchbuffer;
@@ -147,6 +150,7 @@ typedef struct drm_i915_private {
147 u32 saveDSPBCNTR; 150 u32 saveDSPBCNTR;
148 u32 saveDSPARB; 151 u32 saveDSPARB;
149 u32 saveRENDERSTANDBY; 152 u32 saveRENDERSTANDBY;
153 u32 saveHWS;
150 u32 savePIPEACONF; 154 u32 savePIPEACONF;
151 u32 savePIPEBCONF; 155 u32 savePIPEBCONF;
152 u32 savePIPEASRC; 156 u32 savePIPEASRC;
@@ -446,6 +450,13 @@ extern int i915_vblank_swap(struct drm_device *dev, void *data,
446 struct drm_file *file_priv); 450 struct drm_file *file_priv);
447extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask); 451extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask);
448 452
453void
454i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
455
456void
457i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
458
459
449/* i915_mem.c */ 460/* i915_mem.c */
450extern int i915_mem_alloc(struct drm_device *dev, void *data, 461extern int i915_mem_alloc(struct drm_device *dev, void *data,
451 struct drm_file *file_priv); 462 struct drm_file *file_priv);