Merge bk://drm.bkbits.net/drm-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

drivers/char/drm/drm_drv.h

@@ -480,6 +480,9 @@ static int DRM(probe)(struct pci_dev *pdev)
 	if (DRM(numdevs) >= MAX_DEVICES)
 		return -ENODEV;
 
+	if ((retcode=pci_enable_device(pdev)))
+		return retcode;
+
 	dev = &(DRM(device)[DRM(numdevs)]);
 
 	memset( (void *)dev, 0, sizeof(*dev) );
@@ -785,7 +788,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
 
 		add_wait_queue( &dev->lock.lock_queue, &entry );
 		for (;;) {
-			current->state = TASK_INTERRUPTIBLE;
+			__set_current_state(TASK_INTERRUPTIBLE);
 			if ( !dev->lock.hw_lock ) {
 				/* Device has been unregistered */
 				retcode = -EINTR;
@@ -805,7 +808,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
 				break;
 			}
 		}
-		current->state = TASK_RUNNING;
+		__set_current_state(TASK_RUNNING);
 		remove_wait_queue( &dev->lock.lock_queue, &entry );
 		if( !retcode ) {
 			if (dev->fn_tbl.release)
@@ -985,7 +988,7 @@ int DRM(lock)( struct inode *inode, struct file *filp,
 
 	add_wait_queue( &dev->lock.lock_queue, &entry );
 	for (;;) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 		if ( !dev->lock.hw_lock ) {
 			/* Device has been unregistered */
 			ret = -EINTR;
@@ -1006,7 +1009,7 @@ int DRM(lock)( struct inode *inode, struct file *filp,
 			break;
 		}
 	}
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	remove_wait_queue( &dev->lock.lock_queue, &entry );
 
 	sigemptyset( &dev->sigmask );

drivers/char/drm/drm_os_linux.h

@@ -134,7 +134,7 @@ do {								\
 	add_wait_queue(&(queue), &entry);			\
 								\
 	for (;;) {						\
-		current->state = TASK_INTERRUPTIBLE;		\
+		__set_current_state(TASK_INTERRUPTIBLE);	\
 		if (condition)					\
 			break;					\
 		if (time_after_eq(jiffies, end)) {		\
@@ -147,7 +147,7 @@ do {								\
 			break;					\
 		}						\
 	}							\
-	current->state = TASK_RUNNING;				\
+	__set_current_state(TASK_RUNNING);			\
 	remove_wait_queue(&(queue), &entry);			\
 } while (0)
 

drivers/char/drm/drm_scatter.h

@@ -73,7 +73,7 @@ int DRM(sg_alloc)( struct inode *inode, struct file *filp,
 
 	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
-	if (drm_core_check_feature(dev, DRIVER_SG))
+	if (!drm_core_check_feature(dev, DRIVER_SG))
 		return -EINVAL;
 
 	if ( dev->sg )

drivers/char/drm/i830_irq.c

@@ -92,7 +92,7 @@ int i830_wait_irq(drm_device_t *dev, int irq_nr)
 	add_wait_queue(&dev_priv->irq_queue, &entry);
 
 	for (;;) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 	   	if (atomic_read(&dev_priv->irq_received) >= irq_nr) 
 		   break;
 		if((signed)(end - jiffies) <= 0) {
@@ -112,7 +112,7 @@ int i830_wait_irq(drm_device_t *dev, int irq_nr)
 		}
 	}
 
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(&dev_priv->irq_queue, &entry);
 	return ret;
 }