svn commit: r186465 - head/sys/dev/drm

[Robert Noland]

Author: rnoland
Date: Tue Dec 23 22:53:57 2008
New Revision: 186465
URL: http://svn.freebsd.org/changeset/base/186465

Log:
  Only set registers if irqs are enabled
  
  Approved by:	kib
  Obtained from:	drm git

Modified:
  head/sys/dev/drm/radeon_irq.c

Modified: head/sys/dev/drm/radeon_irq.c
==============================================================================
--- head/sys/dev/drm/radeon_irq.c	Tue Dec 23 22:51:10 2008	(r186464)
+++ head/sys/dev/drm/radeon_irq.c	Tue Dec 23 22:53:57 2008	(r186465)
@@ -47,7 +47,8 @@ void radeon_irq_set_state(struct drm_dev
 	else
 		dev_priv->irq_enable_reg &= ~mask;
 
-	RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
+	if (dev->irq_enabled)
+		RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
 }
 
 static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)
@@ -59,7 +60,8 @@ static void r500_vbl_irq_set_state(struc
 	else
 		dev_priv->r500_disp_irq_reg &= ~mask;
 
-	RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
+	if (dev->irq_enabled)
+		RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
 }
 
 int radeon_enable_vblank(struct drm_device *dev, int crtc)