fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 00:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/modesetting-101' into modesetting-gem

Browse source
This commit is contained in:
Dave Airlie 2008-07-26 08:46:38 +10:00
commit 31da9492a4
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
linux-core/drm_lock.c
View file

@ -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);

2
linux-core/nv50_crtc.c
View file

@ -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;
}

2
linux-core/nv50_display.c
View file

@ -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;
}

6
linux-core/nv50_kms_wrapper.c
View file

@ -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)