summaryrefslogtreecommitdiff
path: root/linux/drm_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-08-29 12:04:35 +0000
committerDave Airlie <airlied@linux.ie>2004-08-29 12:04:35 +0000
commit1430163b4bbf7b00367ea1066c1c5fe85dbeefed (patch)
tree478348e12b86280253f91beb4b23ed90ea349b04 /linux/drm_drv.h
parent6916572c1c32cd030258ab917f0a568517d5006b (diff)
Drop GAMMA DRM from a great height ...
Diffstat (limited to 'linux/drm_drv.h')
-rw-r--r--linux/drm_drv.h66
1 files changed, 27 insertions, 39 deletions
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 1a5a4696..2c687111 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -413,8 +413,6 @@ static int DRM(takedown)( drm_device_t *dev )
if ( (dev->driver_features & DRIVER_DMA_QUEUE) && dev->queuelist ) {
for ( i = 0 ; i < dev->queue_count ; i++ ) {
- if (dev->fn_tbl.waitlist_destroy)
- dev->fn_tbl.waitlist_destroy( &dev->queuelist[i]->waitlist);
if ( dev->queuelist[i] ) {
DRM(free)( dev->queuelist[i],
@@ -1106,40 +1104,33 @@ int DRM(lock)( struct inode *inode, struct file *filp,
if ( lock.context < 0 )
return -EINVAL;
- if (dev->fn_tbl.dma_flush_block_and_flush)
- ret = dev->fn_tbl.dma_flush_block_and_flush(dev, lock.context, lock.flags);
- if ( !ret ) {
- add_wait_queue( &dev->lock.lock_queue, &entry );
- for (;;) {
- current->state = TASK_INTERRUPTIBLE;
- if ( !dev->lock.hw_lock ) {
- /* Device has been unregistered */
- ret = -EINTR;
- break;
- }
- if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
- lock.context ) ) {
- dev->lock.filp = filp;
- dev->lock.lock_time = jiffies;
- atomic_inc( &dev->counts[_DRM_STAT_LOCKS] );
- break; /* Got lock */
- }
-
- /* Contention */
- schedule();
- if ( signal_pending( current ) ) {
- ret = -ERESTARTSYS;
- break;
- }
- }
- current->state = TASK_RUNNING;
- remove_wait_queue( &dev->lock.lock_queue, &entry );
- }
-
- if (dev->fn_tbl.dma_flush_unblock)
- dev->fn_tbl.dma_flush_unblock(dev, lock.context, lock.flags);
-
- if ( !ret ) {
+ add_wait_queue( &dev->lock.lock_queue, &entry );
+ for (;;) {
+ current->state = TASK_INTERRUPTIBLE;
+ if ( !dev->lock.hw_lock ) {
+ /* Device has been unregistered */
+ ret = -EINTR;
+ break;
+ }
+ if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
+ lock.context ) ) {
+ dev->lock.filp = filp;
+ dev->lock.lock_time = jiffies;
+ atomic_inc( &dev->counts[_DRM_STAT_LOCKS] );
+ break; /* Got lock */
+ }
+
+ /* Contention */
+ schedule();
+ if ( signal_pending( current ) ) {
+ ret = -ERESTARTSYS;
+ break;
+ }
+ }
+ current->state = TASK_RUNNING;
+ remove_wait_queue( &dev->lock.lock_queue, &entry );
+
+ if ( !ret ) {
sigemptyset( &dev->sigmask );
sigaddset( &dev->sigmask, SIGSTOP );
sigaddset( &dev->sigmask, SIGTSTP );
@@ -1204,9 +1195,6 @@ int DRM(unlock)( struct inode *inode, struct file *filp,
DRM(lock_transfer)( dev, &dev->lock.hw_lock->lock,
DRM_KERNEL_CONTEXT );
- if (dev->fn_tbl.dma_schedule)
- dev->fn_tbl.dma_schedule(dev, 1);
-
if ( DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
DRM_KERNEL_CONTEXT ) ) {
DRM_ERROR( "\n" );