From: <ag...@ke...> - 2009-02-25 16:03:38
|
shared-core/r600_cp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 39de178f68a1843e5cab56fe4ae5386379479625 Author: Alex Deucher <ale...@gm...> Date: Wed Feb 25 11:02:46 2009 -0500 r6xx/r7xx: re-init vm regs on resume should fix resume diff --git a/shared-core/r600_cp.c b/shared-core/r600_cp.c index 6f1ba41..165bd2d 100644 --- a/shared-core/r600_cp.c +++ b/shared-core/r600_cp.c @@ -2492,10 +2492,13 @@ int r600_do_resume_cp(struct drm_device * dev) drm_radeon_private_t *dev_priv = dev->dev_private; DRM_DEBUG("\n"); - if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) - r700_cp_load_microcode(dev_priv); - else - r600_cp_load_microcode(dev_priv); + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) { + r700_vm_init(dev); + r700_cp_load_microcode(dev_priv); + } else { + r600_vm_init(dev); + r600_cp_load_microcode(dev_priv); + } r600_cp_init_ring_buffer(dev, dev_priv); r600_engine_reset(dev); |