drm: don't set the signal blocker on the master process. (3e5fc80a) · Commits · 戴 / test

There is a problem with debugging the X server and gdb crashes in the xkb startup code. This avoids the problem by allowing the master process to get signals. It should be safe as the signal blocker is mainly so that you can Ctrl-Z a 3D application without locking up the whole box. Ctrl-Z the X server isn't something many people do. Signed-off-by:

Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/drm_lock.c

+13 −8

Original line number	Diff line number	Diff line
		@@ -105,6 +105,10 @@ int drm_lock(struct drm_device dev, void data, struct drm_file *file_priv)
		ret ? "interrupted" : "has lock");
		if (ret) return ret;

		/* 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);
		@@ -113,6 +117,7 @@ int drm_lock(struct drm_device dev, void data, struct drm_file *file_priv)
		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);

Admin message