summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-07-26 08:46:38 +1000
committerDave Airlie <airlied@linux.ie>2008-07-26 08:46:38 +1000
commit31da9492a4129f5255e949836c51e9dfbfb270c4 (patch)
tree49011a044045a25c44c64e7447643702f8be31ce
parent11d30750873260fe19498d90831f07079dfad5d8 (diff)
parent7fd7ba87f35aa4881e99b95bab4151b3f9db9b8e (diff)
Merge remote branch 'origin/modesetting-101' into modesetting-gem
-rw-r--r--linux-core/drm_lock.c21
-rw-r--r--linux-core/nv50_crtc.c2
-rw-r--r--linux-core/nv50_display.c2
-rw-r--r--linux-core/nv50_kms_wrapper.c6
4 files changed, 18 insertions, 13 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);
diff --git a/linux-core/nv50_crtc.c b/linux-core/nv50_crtc.c
index c4ca7e76..f56aa339 100644
--- a/linux-core/nv50_crtc.c
+++ b/linux-core/nv50_crtc.c
@@ -127,7 +127,7 @@ static int nv50_crtc_execute_mode(struct nv50_crtc *crtc)
OUT_MODE(NV50_CRTC0_SCALE_CENTER_OFFSET + offset, NV50_CRTC_SCALE_CENTER_OFFSET_VAL(0,0));
/* Maybe move this as well? */
- crtc->blank(crtc, FALSE);
+ crtc->blank(crtc, false);
return 0;
}
diff --git a/linux-core/nv50_display.c b/linux-core/nv50_display.c
index b68c4e28..eeaa0e68 100644
--- a/linux-core/nv50_display.c
+++ b/linux-core/nv50_display.c
@@ -171,7 +171,7 @@ static int nv50_display_disable(struct nv50_display *display)
/* disable clock change interrupts. */
NV_WRITE(NV50_PDISPLAY_SUPERVISOR_INTR, NV_READ(NV50_PDISPLAY_SUPERVISOR_INTR) & ~0x70);
- display->init_done = FALSE;
+ display->init_done = false;
return 0;
}
diff --git a/linux-core/nv50_kms_wrapper.c b/linux-core/nv50_kms_wrapper.c
index 694b7260..77271c1b 100644
--- a/linux-core/nv50_kms_wrapper.c
+++ b/linux-core/nv50_kms_wrapper.c
@@ -952,11 +952,11 @@ static enum drm_connector_status nv50_kms_connector_detect(struct drm_connector
i2c_detect = connector->i2c_detect(connector);
if (load_detect == 1) {
- nv50_kms_connector_set_digital(drm_connector, 0, TRUE); /* analog, forced */
+ nv50_kms_connector_set_digital(drm_connector, 0, true); /* analog, forced */
} else if (hpd_detect == 1 && load_detect == 0) {
- nv50_kms_connector_set_digital(drm_connector, 1, TRUE); /* digital, forced */
+ nv50_kms_connector_set_digital(drm_connector, 1, true); /* digital, forced */
} else {
- nv50_kms_connector_set_digital(drm_connector, -1, TRUE); /* unknown, forced */
+ nv50_kms_connector_set_digital(drm_connector, -1, true); /* unknown, forced */
}
if (hpd_detect == 1 || load_detect == 1 || i2c_detect == 1)