diff options
| author | anholt <anholt@FreeBSD.org> | 2006-04-09 20:45:45 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2006-04-09 20:45:45 +0000 |
| commit | 766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd (patch) | |
| tree | f57db1633125210d36e905094cb555bdb5e70914 /sys/dev/drm/i915_drv.h | |
| parent | f1ed1ae32f905b9101d13a09efee70142edabf48 (diff) | |
| download | FreeBSD-src-766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd.zip FreeBSD-src-766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd.tar.gz | |
Update to DRM CVS as of 2006-04-09. The most notable new feature is the updated
Radeon memmap code, which with a new DDX driver and DRI drivers should fix
long-term stability issues with Radeons. Also adds support for r200's
ATI_fragment_shader, r300 texrect support and texture caching fixes, i915
vblank support and bugfixes, and new PCI IDs.
Diffstat (limited to 'sys/dev/drm/i915_drv.h')
| -rw-r--r-- | sys/dev/drm/i915_drv.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h index 50d8437..53a76f6 100644 --- a/sys/dev/drm/i915_drv.h +++ b/sys/dev/drm/i915_drv.h @@ -40,15 +40,17 @@ __FBSDID("$FreeBSD$"); #define DRIVER_NAME "i915" #define DRIVER_DESC "Intel Graphics" -#define DRIVER_DATE "20041217" +#define DRIVER_DATE "20060119" /* Interface history: * * 1.1: Original. * 1.2: Add Power Management + * 1.3: Add vblank support + * 1.4: Fix cmdbuffer path, add heap destroy */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 2 +#define DRIVER_MINOR 4 #define DRIVER_PATCHLEVEL 0 typedef struct _drm_i915_ring_buffer { @@ -115,6 +117,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, extern int i915_irq_emit(DRM_IOCTL_ARGS); extern int i915_irq_wait(DRM_IOCTL_ARGS); +extern int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence); extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); extern void i915_driver_irq_preinstall(drm_device_t * dev); extern void i915_driver_irq_postinstall(drm_device_t * dev); @@ -124,6 +127,7 @@ extern void i915_driver_irq_uninstall(drm_device_t * dev); extern int i915_mem_alloc(DRM_IOCTL_ARGS); extern int i915_mem_free(DRM_IOCTL_ARGS); extern int i915_mem_init_heap(DRM_IOCTL_ARGS); +extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS); extern void i915_mem_takedown(struct mem_block **heap); extern void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap); @@ -265,4 +269,6 @@ extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller); #define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) +#define READ_BREADCRUMB(dev_priv) (((u32*)(dev_priv->hw_status_page))[5]) + #endif |
