Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: don't set the signal blocker on the master process.
  drm: don't call the vblank tasklet with irqs disabled.
  r300: Fix cliprect emit
  drm/radeon: r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX
  radeon: fix some hard lockups on r3/4/500s

1 files changed, 18 insertions, 15 deletions

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 0998723cde79..a4caf95485d7 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                   ret ? "interrupted" : "has lock");
         if (ret) return ret;
 
-        sigemptyset(&dev->sigmask);
-        sigaddset(&dev->sigmask, SIGSTOP);
-        sigaddset(&dev->sigmask, SIGTSTP);
-        sigaddset(&dev->sigmask, SIGTTIN);
-        sigaddset(&dev->sigmask, SIGTTOU);
-        dev->sigdata.context = lock->context;
-        dev->sigdata.lock = dev->lock.hw_lock;
-        block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+        /* don't set the block all signals on the master process for now 
+         * really probably not the correct answer but lets us debug xkb
+         * xserver for now */
+        if (!file_priv->master) {
+                sigemptyset(&dev->sigmask);
+                sigaddset(&dev->sigmask, SIGSTOP);
+                sigaddset(&dev->sigmask, SIGTSTP);
+                sigaddset(&dev->sigmask, SIGTTIN);
+                sigaddset(&dev->sigmask, SIGTTOU);
+                dev->sigdata.context = lock->context;
+                dev->sigdata.lock = dev->lock.hw_lock;
+                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+        }
 
         if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY))
                 dev->driver->dma_ready(dev);
@@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         struct drm_lock *lock = data;
         unsigned long irqflags;
+        void (*tasklet_func)(struct drm_device *);
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
                 DRM_ERROR("Process %d using kernel context %d\n",
@@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
         }
 
         spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-
-        if (dev->locked_tasklet_func) {
-                dev->locked_tasklet_func(dev);
-
-                dev->locked_tasklet_func = NULL;
-        }
-
+        tasklet_func = dev->locked_tasklet_func;
+        dev->locked_tasklet_func = NULL;
         spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+        if (tasklet_func != NULL)
+                tasklet_func(dev);
 
         atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);