diff options
| author | Kevin E Martin <kem@kem.org> | 2001-03-07 19:14:39 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-03-07 19:14:39 +0000 |
| commit | 7e820fc7d89d06a11f448d7093469a0c765a84a6 (patch) | |
| tree | 0b0e71d032fedccb0ac40ddf7303cda2de53451a /linux/gamma_drv.c | |
| parent | 78b07aa0d7a25ffbc1a2c07737fcb7597c4e6694 (diff) | |
- Prepare for merge with trunksarea-1-0-0-20010307-freeze
- Change variable names to be more consistent
- Fix bug in per-context creation routine
- Fix root-only permissions for get/setsareactx IOCTLs
- Back out incomplete gamma changes
- Fix some compilation warning messages
- Various code cleanups
- Disable per-context SAREA example code for Radeon This can be re-enabled
when it is actually used by the driver. Look for '#ifdef
PER_CONTEXT_SAREA' in the client-side and ddx Radeon driver.
Diffstat (limited to 'linux/gamma_drv.c')
| -rw-r--r-- | linux/gamma_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index ae73aca4..c24d5a33 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -46,8 +46,7 @@ #define DRIVER_IOCTLS \ - [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { gamma_dma, 1, 0 }, \ - [DRM_IOCTL_NR(DRM_IOCTL_GAMMA_INIT)] = { gamma_dma_init, 1, 0 } + [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { gamma_dma, 1, 0 } #define __HAVE_MTRR 1 #define __HAVE_CTX_BITMAP 0 @@ -90,13 +89,14 @@ do { \ gamma_reclaim_buffers( dev, priv->pid ); \ if ( dev->dev_private ) { \ drm_gamma_private_t *dev_priv = dev->dev_private; \ + dev_priv->dispatch_status &= MGA_IN_DISPATCH; \ } \ } while (0) #endif #if 0 #define DRIVER_PRETAKEDOWN() do { \ - if ( dev->dev_private ) gamma_dma_cleanup( dev ); \ + if ( dev->dev_private ) gamma_do_cleanup_dma( dev ); \ } while (0) #endif |