diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-13 10:52:32 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-03-13 10:52:32 -0400 |
| commit | 36d30bc75dabc39f69e5d5475c84aa4186fbbdbf (patch) | |
| tree | 265eb7d8355c2c0a96ea30244438c2950994b4ef | |
| parent | abed41e1086673ab564fe2969be56bd3b6141d89 (diff) | |
drm/radeon: don't call irq changes on r600 suspend/resume
Until we sort out r600 IRQs don't do this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | linux-core/radeon_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c index 934fa0b9..5f9c3583 100644 --- a/linux-core/radeon_drv.c +++ b/linux-core/radeon_drv.c @@ -56,6 +56,9 @@ static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) + return 0; + /* Disable *all* interrupts */ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) RADEON_WRITE(R500_DxMODE_INT_MASK, 0); @@ -67,6 +70,9 @@ static int radeon_resume(struct drm_device *dev) { drm_radeon_private_t *dev_priv = dev->dev_private; + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) + return 0; + /* Restore interrupt registers */ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); |