aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/drm/i915_drv.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-05 05:20:33 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 05:20:33 -0400
commitd0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (patch)
tree62615ed8bc6ab68f42b59d412a7fd7ac77c79803 /drivers/char/drm/i915_drv.h
parent6f1062330499cee10396bf3fc66a03eb228c5fad (diff)
parent586a4ac509b041df55f26c2b26cd7cbdaf9b045d (diff)
/spare/repo/libata-dev branch 'iomap-try3'
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r--drivers/char/drm/i915_drv.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 9c37d2367dd..70ed4e68eac 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -79,9 +79,10 @@ typedef struct drm_i915_private {
drm_i915_sarea_t *sarea_priv;
drm_i915_ring_buffer_t ring;
+ drm_dma_handle_t *status_page_dmah;
void *hw_status_page;
- unsigned long counter;
dma_addr_t dma_status_page;
+ unsigned long counter;
int back_offset;
int front_offset;
@@ -102,6 +103,7 @@ typedef struct drm_i915_private {
extern void i915_kernel_lost_context(drm_device_t * dev);
extern void i915_driver_pretakedown(drm_device_t *dev);
extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp);
+extern int i915_driver_device_is_agp(drm_device_t *dev);
/* i915_irq.c */
extern int i915_irq_emit(DRM_IOCTL_ARGS);