aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-12-22 17:11:02 +1000
committerDave Airlie <airlied@redhat.com>2008-12-23 10:50:12 +1000
commit077ebed54fe66612f58b076628a72eca2be8df90 (patch)
tree93c796be33d193b3e3dd06741910df3b36bcb07f
parent3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff)
downloadkernel_samsung_smdk4412-077ebed54fe66612f58b076628a72eca2be8df90.zip
kernel_samsung_smdk4412-077ebed54fe66612f58b076628a72eca2be8df90.tar.gz
kernel_samsung_smdk4412-077ebed54fe66612f58b076628a72eca2be8df90.tar.bz2
drm/radeon: fix correctness of irq_enabled check for radeon.
This check was introduced with the logic the wrong way around. Fixes regression: http://bugzilla.kernel.org/show_bug.cgi?id=12216 Tested-by: François Valenduc <francois.valenduc@tvcablenet.be> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index 99be114..8289e16 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
@@ -44,7 +44,7 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
else
dev_priv->irq_enable_reg &= ~mask;
- if (!dev->irq_enabled)
+ if (dev->irq_enabled)
RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
}
@@ -57,7 +57,7 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)
else
dev_priv->r500_disp_irq_reg &= ~mask;
- if (!dev->irq_enabled)
+ if (dev->irq_enabled)
RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
}