diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-06-01 02:03:31 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-06-01 02:03:31 +0000 |
| commit | 1c4ec03eedf9390bc32019be7651824400452499 (patch) | |
| tree | 3cde8343c519258d2ab5232b45c426e435f5b9af /sys | |
| parent | e8ae66891c1416844cd0f54ec3739ece03ff398c (diff) | |
Make mutexes that get used in interrupts IPL_TTY instead of IPL_NONE.
ok jsg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_pm.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 29b95498d5f..ae5d214d42b 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.31 2013/05/21 22:12:58 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.32 2013/06/01 02:03:30 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -979,9 +979,9 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) i915_gem_load(dev); mtx_init(&dev_priv->irq_lock, IPL_TTY); - mtx_init(&dev_priv->rps.lock, IPL_NONE); - mtx_init(&dev_priv->dpio_lock, IPL_NONE); - mtx_init(&mchdev_lock, IPL_NONE); + mtx_init(&dev_priv->rps.lock, IPL_TTY); + mtx_init(&dev_priv->dpio_lock, IPL_TTY); + mtx_init(&mchdev_lock, IPL_TTY); mtx_init(&dev_priv->error_completion_lock, IPL_NONE); rw_init(&dev_priv->rps.hw_lock, "rpshw"); diff --git a/sys/dev/pci/drm/i915/intel_pm.c b/sys/dev/pci/drm/i915/intel_pm.c index c013eb2e48b..6aec6c0a5a9 100644 --- a/sys/dev/pci/drm/i915/intel_pm.c +++ b/sys/dev/pci/drm/i915/intel_pm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_pm.c,v 1.5 2013/05/05 13:55:36 kettenis Exp $ */ +/* $OpenBSD: intel_pm.c,v 1.6 2013/06/01 02:03:30 kettenis Exp $ */ /* * Copyright © 2012 Intel Corporation * @@ -4674,7 +4674,7 @@ intel_gt_init(struct drm_device *dev) { struct inteldrm_softc *dev_priv = dev->dev_private; - mtx_init(&dev_priv->gt_lock, IPL_NONE); + mtx_init(&dev_priv->gt_lock, IPL_TTY); intel_gt_reset(dev); |