diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-23 20:01:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-23 20:01:40 -0500 |
| commit | 8960223d5973b3eaf8cbc1984969bb6c7661e7b9 (patch) | |
| tree | cb9007b5aec34cc9cf56ddf0e763695ffae178f3 | |
| parent | d519c8d9ccb7956e61a55ce3a0fd6a25f42cbb33 (diff) | |
| parent | 077ebed54fe66612f58b076628a72eca2be8df90 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: fix correctness of irq_enabled check for radeon.
| -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) | |||
| 44 | else | 44 | else |
| 45 | dev_priv->irq_enable_reg &= ~mask; | 45 | dev_priv->irq_enable_reg &= ~mask; |
| 46 | 46 | ||
| 47 | if (!dev->irq_enabled) | 47 | if (dev->irq_enabled) |
| 48 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); | 48 | RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| @@ -57,7 +57,7 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) | |||
| 57 | else | 57 | else |
| 58 | dev_priv->r500_disp_irq_reg &= ~mask; | 58 | dev_priv->r500_disp_irq_reg &= ~mask; |
| 59 | 59 | ||
| 60 | if (!dev->irq_enabled) | 60 | if (dev->irq_enabled) |
| 61 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); | 61 | RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); |
| 62 | } | 62 | } |
| 63 | 63 | ||