From 9b88d5a56b5df088ed28704cd5dbc84d34c65fce Mon Sep 17 00:00:00 2001 From: Owain Ainsworth Date: Mon, 4 Jul 2011 23:10:08 +0000 Subject: Temporarily back out msi for inteldrm. Some gm45 and 965 are having issues and this fixes it for halex at least. Art's machine (945gm) is also playing up but he didn't update for a year (and the problem doesn't look like what i would expect). --- sys/dev/pci/drm/i915_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 6784952f499..046a912fbad 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.113 2011/07/03 20:20:42 deraadt Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.114 2011/07/04 23:10:07 oga Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth * @@ -367,8 +367,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) if (IS_I945G(dev_priv) || IS_I945GM(dev_priv)) pa->pa_flags &= ~PCI_FLAGS_MSI_ENABLED; - if (pci_intr_map_msi(pa, &dev_priv->ih) != 0 && - pci_intr_map(pa, &dev_priv->ih) != 0) { + if (pci_intr_map(pa, &dev_priv->ih) != 0) { printf(": couldn't map interrupt\n"); return; } -- cgit v1.2.3