On Tue, Mar 10, 2009 at 3:41 AM, Dave Airlie <[email protected]> wrote: > From: Dave Airlie <[email protected]> > > Until we sort out r600 IRQs don't do this. > > Signed-off-by: Dave Airlie <[email protected]>
Should be ok since GEN_INT_CNTL is unassigned register space on r6xx/r7xx, but better safe than sorry. Acked-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/radeon/radeon_drv.c | 6 ++++++ > 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 2cb4f32..13a60f4 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) > { > 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); > -- > 1.6.2 > > > ------------------------------------------------------------------------------ > -- > _______________________________________________ > Dri-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/dri-devel > ------------------------------------------------------------------------------ -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
