diff options
| -rw-r--r-- | drivers/gpu/drm/drm_lock.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index d78e0dc18245..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) | |||
| 105 | ret ? "interrupted" : "has lock"); | 105 | ret ? "interrupted" : "has lock"); |
| 106 | if (ret) return ret; | 106 | if (ret) return ret; |
| 107 | 107 | ||
| 108 | sigemptyset(&dev->sigmask); | 108 | /* don't set the block all signals on the master process for now |
| 109 | sigaddset(&dev->sigmask, SIGSTOP); | 109 | * really probably not the correct answer but lets us debug xkb |
| 110 | sigaddset(&dev->sigmask, SIGTSTP); | 110 | * xserver for now */ |
| 111 | sigaddset(&dev->sigmask, SIGTTIN); | 111 | if (!file_priv->master) { |
| 112 | sigaddset(&dev->sigmask, SIGTTOU); | 112 | sigemptyset(&dev->sigmask); |
| 113 | dev->sigdata.context = lock->context; | 113 | sigaddset(&dev->sigmask, SIGSTOP); |
| 114 | dev->sigdata.lock = dev->lock.hw_lock; | 114 | sigaddset(&dev->sigmask, SIGTSTP); |
| 115 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | 115 | sigaddset(&dev->sigmask, SIGTTIN); |
| 116 | sigaddset(&dev->sigmask, SIGTTOU); | ||
| 117 | dev->sigdata.context = lock->context; | ||
| 118 | dev->sigdata.lock = dev->lock.hw_lock; | ||
| 119 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | ||
| 120 | } | ||
| 116 | 121 | ||
| 117 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) | 122 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) |
| 118 | dev->driver->dma_ready(dev); | 123 | dev->driver->dma_ready(dev); |