diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-03-06 19:21:23 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-03-06 19:21:23 +0000 |
| commit | bf4b8ba753807eac22e7b14a5581c3c883d9473c (patch) | |
| tree | bcba6ae627b6f8713e85d476406abf9d00e39313 | |
| parent | a01d26f39d7e1fcf0ffafc04df832f72ae3d3896 (diff) | |
Remove the vbl signal code because it's untested (and has lock issues on
-current).
| -rw-r--r-- | bsd-core/drmP.h | 3 | ||||
| -rw-r--r-- | bsd-core/drm_dma.c | 11 | ||||
| -rw-r--r-- | bsd/drmP.h | 3 | ||||
| -rw-r--r-- | bsd/drm_dma.h | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index a4308f37..75b8fb92 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.2 2002/04/29 18:18:42 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -489,9 +490,11 @@ struct drm_device { #if __HAVE_VBL_IRQ wait_queue_head_t vbl_queue; /* vbl wait channel */ atomic_t vbl_received; +#if 0 /* vbl signals are untested, ntested */ struct drm_vbl_sig_list vbl_sig_list; DRM_SPINTYPE vbl_lock; #endif +#endif cycles_t ctx_start; cycles_t lck_start; #if __HAVE_DMA_HISTOGRAM diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c index 7c1e97fe..231b3292 100644 --- a/bsd-core/drm_dma.c +++ b/bsd-core/drm_dma.c @@ -524,7 +524,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) TASK_INIT(&dev->task, 0, DRM(dma_immediate_bh), dev); #endif -#if __HAVE_VBL_IRQ +#if __HAVE_VBL_IRQ && 0 /* disabled */ DRM_SPININIT( dev->vbl_lock, "vblsig" ); TAILQ_INIT( &dev->vbl_sig_list ); #endif @@ -645,6 +645,7 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK; if (flags & _DRM_VBLANK_SIGNAL) { +#if 0 /* disabled */ drm_vbl_sig_t *vbl_sig = DRM_MALLOC(sizeof(drm_vbl_sig_t)); if (vbl_sig == NULL) return ENOMEM; @@ -660,6 +661,8 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) TAILQ_INSERT_HEAD(&dev->vbl_sig_list, vbl_sig, link); DRM_SPINUNLOCK(&dev->vbl_lock); ret = 0; +#endif + ret = EINVAL; } else { ret = DRM(vblank_wait)(dev, &vblwait.request.sequence); @@ -674,6 +677,11 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) return ret; } +void DRM(vbl_send_signals)(drm_device_t *dev) +{ +} + +#if 0 /* disabled */ void DRM(vbl_send_signals)( drm_device_t *dev ) { drm_vbl_sig_t *vbl_sig; @@ -699,6 +707,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev ) DRM_SPINUNLOCK(&dev->vbl_lock); } +#endif #endif /* __HAVE_VBL_IRQ */ @@ -27,6 +27,7 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.2 2002/04/29 18:18:42 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -489,9 +490,11 @@ struct drm_device { #if __HAVE_VBL_IRQ wait_queue_head_t vbl_queue; /* vbl wait channel */ atomic_t vbl_received; +#if 0 /* vbl signals are untested, ntested */ struct drm_vbl_sig_list vbl_sig_list; DRM_SPINTYPE vbl_lock; #endif +#endif cycles_t ctx_start; cycles_t lck_start; #if __HAVE_DMA_HISTOGRAM diff --git a/bsd/drm_dma.h b/bsd/drm_dma.h index 7c1e97fe..231b3292 100644 --- a/bsd/drm_dma.h +++ b/bsd/drm_dma.h @@ -524,7 +524,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq ) TASK_INIT(&dev->task, 0, DRM(dma_immediate_bh), dev); #endif -#if __HAVE_VBL_IRQ +#if __HAVE_VBL_IRQ && 0 /* disabled */ DRM_SPININIT( dev->vbl_lock, "vblsig" ); TAILQ_INIT( &dev->vbl_sig_list ); #endif @@ -645,6 +645,7 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK; if (flags & _DRM_VBLANK_SIGNAL) { +#if 0 /* disabled */ drm_vbl_sig_t *vbl_sig = DRM_MALLOC(sizeof(drm_vbl_sig_t)); if (vbl_sig == NULL) return ENOMEM; @@ -660,6 +661,8 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) TAILQ_INSERT_HEAD(&dev->vbl_sig_list, vbl_sig, link); DRM_SPINUNLOCK(&dev->vbl_lock); ret = 0; +#endif + ret = EINVAL; } else { ret = DRM(vblank_wait)(dev, &vblwait.request.sequence); @@ -674,6 +677,11 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) return ret; } +void DRM(vbl_send_signals)(drm_device_t *dev) +{ +} + +#if 0 /* disabled */ void DRM(vbl_send_signals)( drm_device_t *dev ) { drm_vbl_sig_t *vbl_sig; @@ -699,6 +707,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev ) DRM_SPINUNLOCK(&dev->vbl_lock); } +#endif #endif /* __HAVE_VBL_IRQ */ |