]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm/radeon: don't call irq changes on r600 suspend/resume
authorDave Airlie <airlied@redhat.com>
Tue, 10 Mar 2009 08:36:38 +0000 (18:36 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 13 Mar 2009 04:24:21 +0000 (14:24 +1000)
Until we sort out r600 IRQs don't do this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_drv.c

index 2cb4f32b81d48351a1c1d817cb7e8b9d3dfeee69..13a60f4d42275f772c81a360d0c2d60fd83f8c17 100644 (file)
@@ -45,6 +45,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_RS600)
                RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
@@ -56,6 +59,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_RS600)
                RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);