diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-09-20 14:29:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-09-20 14:29:35 +0000 |
| commit | 23dc9f3b55a7193e8e26209111ed769feb27a651 (patch) | |
| tree | 03363bb1d61739f4955e99d1e1e58cfc66874b70 /sys/dev | |
| parent | 808f4aee212e1f5659a0ec97351360a7218e5b38 (diff) | |
In its current state the ring code doesn't work on sandybridge. As a result
idling the rings fails and esults in an infinte sleep. So skip initialization
of the rings altogetheron sandybridge. Issuing 3D commands won't work in that
state, but at least VT switches (and therefore suspend) will no longer hang.
This is a temporary measure until the ring code has been fixed.
ok oga@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 84ba5c5219d..76ad35fe01a 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.117 2011/09/20 14:25:14 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.118 2011/09/20 14:29:34 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -4230,6 +4230,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, struct inteldrm_softc *dev_priv = dev->dev_private; int ret; + /* XXX until we have support for the rings on sandybridge */ + if (IS_GEN6(dev_priv)) + return (0); + if (dev_priv->mm.wedged) { DRM_ERROR("Reenabling wedged hardware, good luck\n"); dev_priv->mm.wedged = 0; |