summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2011-06-19 12:04:21 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2011-06-19 12:04:21 +0000
commitf04ffa2fc43cbc9f0a17f11a4029cc56cba0a910 (patch)
tree3f304914911df5742d7ab6387a32588f34a8f549
parent18f1c0077ad93985b7c85bb0edf999ece081fcc0 (diff)
Don't assume no interrupts if the command processor is not running.
While this means we are on the way to vt switch a few things want vblanks interrupts between disabling the cp and the vt switch (modeset_ctl ioctls for example) tested by jsg@, found and ok kettenis@.
-rw-r--r--sys/dev/pci/drm/radeon_irq.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/radeon_irq.c b/sys/dev/pci/drm/radeon_irq.c
index 44e0954edcc..b8276837532 100644
--- a/sys/dev/pci/drm/radeon_irq.c
+++ b/sys/dev/pci/drm/radeon_irq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeon_irq.c,v 1.26 2011/06/02 18:22:00 weerd Exp $ */
+/* $OpenBSD: radeon_irq.c,v 1.27 2011/06/19 12:04:20 oga Exp $ */
/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
/*
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -197,9 +197,6 @@ radeondrm_intr(void *arg)
drm_radeon_private_t *dev_priv = dev->dev_private;
u_int32_t stat, r500_disp_int;
- if (dev_priv->cp_running == 0)
- return (0);
- /* XXX wtf? */
if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
return (0);