aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-03-10 04:36:38 -0400
committerDave Airlie <airlied@redhat.com>2009-03-13 00:24:21 -0400
commit03efb8853c35aff51c7b901bf412f32765fe0fd9 (patch)
tree25db4f9968bb93ddd358f958e4035976e9510429 /drivers
parentd02f7fa77d97a28a4276939f35e44ae995ad13d7 (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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 2cb4f32b81d4..13a60f4d4227 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -45,6 +45,9 @@ static int radeon_suspend(struct drm_device *dev, pm_message_t state)
45{ 45{
46 drm_radeon_private_t *dev_priv = dev->dev_private; 46 drm_radeon_private_t *dev_priv = dev->dev_private;
47 47
48 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
49 return 0;
50
48 /* Disable *all* interrupts */ 51 /* Disable *all* interrupts */
49 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) 52 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
50 RADEON_WRITE(R500_DxMODE_INT_MASK, 0); 53 RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
@@ -56,6 +59,9 @@ static int radeon_resume(struct drm_device *dev)
56{ 59{
57 drm_radeon_private_t *dev_priv = dev->dev_private; 60 drm_radeon_private_t *dev_priv = dev->dev_private;
58 61
62 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
63 return 0;
64
59 /* Restore interrupt registers */ 65 /* Restore interrupt registers */
60 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) 66 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
61 RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); 67 RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);