diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
commit | 586a4ac509b041df55f26c2b26cd7cbdaf9b045d (patch) | |
tree | dd91fe472070836465da7901f22869b54b2999b8 /drivers/char/drm/i915_drv.h | |
parent | 374b1873571bf80dc0c1fcceaaad067980f3b9de (diff) | |
parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
download | blackbird-obmc-linux-586a4ac509b041df55f26c2b26cd7cbdaf9b045d.tar.gz blackbird-obmc-linux-586a4ac509b041df55f26c2b26cd7cbdaf9b045d.zip |
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r-- | drivers/char/drm/i915_drv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index 9c37d2367dd5..70ed4e68eac8 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); |