diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:46:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:46:38 +1000 |
| commit | 31da9492a4129f5255e949836c51e9dfbfb270c4 (patch) | |
| tree | 49011a044045a25c44c64e7447643702f8be31ce /linux-core/drm_lock.c | |
| parent | 11d30750873260fe19498d90831f07079dfad5d8 (diff) | |
| parent | 7fd7ba87f35aa4881e99b95bab4151b3f9db9b8e (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/drm_lock.c')
| -rw-r--r-- | linux-core/drm_lock.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c index e8bdad92..59f95e4e 100644 --- a/linux-core/drm_lock.c +++ b/linux-core/drm_lock.c @@ -107,14 +107,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 = master->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->is_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 = master->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); |