From 84ce1b1c51b299a9394f6359b3090196191eb48e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 10 Mar 2009 18:36:38 +1000 Subject: [PATCH] --- yaml --- r: 138983 b: refs/heads/master c: 03efb8853c35aff51c7b901bf412f32765fe0fd9 h: refs/heads/master i: 138981: 80ca9ea797c4acff2476fe6f1bc6ed72b77b674d 138979: b425179f9236342e42556f8b4b113f642d11811f 138975: 22c4a305d382cb81e21c89793ac9ba61bea6340f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d1255cdeefbc..16aacbc5faa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d02f7fa77d97a28a4276939f35e44ae995ad13d7 +refs/heads/master: 03efb8853c35aff51c7b901bf412f32765fe0fd9 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_drv.c b/trunk/drivers/gpu/drm/radeon/radeon_drv.c index 2cb4f32b81d4..13a60f4d4227 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_drv.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_drv.c @@ -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);