diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-02-21 07:16:52 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-02-21 07:16:52 +0000 |
| commit | 734270fb379417d5c13550423556999ee93b4b4f (patch) | |
| tree | 29424ae56072f69c52cf44ddb06045c76b36191e /linux/drmP.h | |
| parent | ae0ee9a2f7f84196a616026a5974c8196dc7ab97 (diff) | |
Merge from trunk to bsd-4-0-0-branch.bsd-4-0-0-20030220bsd-4-0-0-branch
Diffstat (limited to 'linux/drmP.h')
| -rw-r--r-- | linux/drmP.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/linux/drmP.h b/linux/drmP.h index 39190b1f..c20166e2 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -489,7 +489,6 @@ typedef struct drm_agp_mem { typedef struct drm_agp_head { agp_kern_info agp_info; - const char *chipset; drm_agp_mem_t *memory; unsigned long mode; int enabled; @@ -521,6 +520,17 @@ typedef struct drm_map_list { typedef drm_map_t drm_local_map_t; +#if __HAVE_VBL_IRQ + +typedef struct drm_vbl_sig { + struct list_head head; + unsigned int sequence; + struct siginfo info; + struct task_struct *task; +} drm_vbl_sig_t; + +#endif + typedef struct drm_device { const char *name; /* Simple driver name */ char *unique; /* Unique identifier: e.g., busid */ @@ -583,6 +593,9 @@ typedef struct drm_device { #if __HAVE_VBL_IRQ wait_queue_head_t vbl_queue; atomic_t vbl_received; + spinlock_t vbl_lock; + drm_vbl_sig_t vbl_sigs; + unsigned int vbl_pending; #endif cycles_t ctx_start; cycles_t lck_start; @@ -823,6 +836,7 @@ extern void DRM(driver_irq_uninstall)( drm_device_t *dev ); extern int DRM(wait_vblank)(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern int DRM(vblank_wait)(drm_device_t *dev, unsigned int *vbl_seq); +extern void DRM(vbl_send_signals)( drm_device_t *dev ); #endif #if __HAVE_DMA_IRQ_BH extern void DRM(dma_immediate_bh)( void *dev ); |