diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-12-22 08:11:02 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-12-23 01:50:12 +0100 |
| commit | 077ebed54fe66612f58b076628a72eca2be8df90 (patch) | |
| tree | 93c796be33d193b3e3dd06741910df3b36bcb07f /drivers/gpu/drm/radeon/radeon_irq.c | |
| parent | Null pointer deref with hrtimer_try_to_cancel() (diff) | |
| download | linux-077ebed54fe66612f58b076628a72eca2be8df90.tar.xz linux-077ebed54fe66612f58b076628a72eca2be8df90.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_irq.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_irq.c | 4 |
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 99be11418ac2..8289e16419a8 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); } |