aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2008-08-25 18:11:06 -0400
committerDave Airlie <airlied@linux.ie>2008-10-17 17:10:11 -0400
commit317c35d1446f68b34d4de4e1100fc01680bd4877 (patch)
treede2e61d658dfc55d3558ad67cb3046205b4bec78 /drivers/gpu/drm/i915/i915_drv.h
parent6b79d521e07aae155303a992245abb539974dbaa (diff)
separate i915 suspend/resume functions into their own file
[Patch against drm-next. Consider this a trial balloon for our new Linux development model.] This is a big chunk of code. Separating it out makes it easier to change without churn on the main i915_drv.c file (and there will be churn as we fix bugs and add things like kernel mode setting). Also makes it easier to share this file with BSD. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
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 e4bd01c511a9..a82b487de7b1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -41,6 +41,11 @@
41#define DRIVER_DESC "Intel Graphics" 41#define DRIVER_DESC "Intel Graphics"
42#define DRIVER_DATE "20060119" 42#define DRIVER_DATE "20060119"
43 43
44enum pipe {
45 PIPE_A = 0,
46 PIPE_B,
47};
48
44/* Interface history: 49/* Interface history:
45 * 50 *
46 * 1.1: Original. 51 * 1.1: Original.
@@ -269,6 +274,10 @@ extern void i915_mem_takedown(struct mem_block **heap);
269extern void i915_mem_release(struct drm_device * dev, 274extern void i915_mem_release(struct drm_device * dev,
270 struct drm_file *file_priv, struct mem_block *heap); 275 struct drm_file *file_priv, struct mem_block *heap);
271 276
277/* i915_suspend.c */
278extern int i915_save_state(struct drm_device *dev);
279extern int i915_restore_state(struct drm_device *dev);
280
272/* i915_opregion.c */ 281/* i915_opregion.c */
273extern int intel_opregion_init(struct drm_device *dev); 282extern int intel_opregion_init(struct drm_device *dev);
274extern void intel_opregion_free(struct drm_device *dev); 283extern void intel_opregion_free(struct drm_device *dev);
@@ -279,6 +288,8 @@ extern void opregion_enable_asle(struct drm_device *dev);
279#define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, (reg), (val)) 288#define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, (reg), (val))
280#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, (reg)) 289#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, (reg))
281#define I915_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, (reg), (val)) 290#define I915_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, (reg), (val))
291#define I915_READ8(reg) DRM_READ8(dev_priv->mmio_map, (reg))
292#define I915_WRITE8(reg,val) DRM_WRITE8(dev_priv->mmio_map, (reg), (val))
282 293
283#define I915_VERBOSE 0 294#define I915_VERBOSE 0
284 295