From 458ffc0661d78ea8a3fbef5507626dc8deac3131 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 28 May 2008 11:46:36 +1000 Subject: [PATCH] --- yaml --- r: 98319 b: refs/heads/master c: d7463eb41d88a39de2653fd41857c4ccddb8707b h: refs/heads/master i: 98317: 836985cde9e79b751d98ee2ee13c10125d3fd4fc 98315: ab8d6a236f61b44cf8edbfa9f6511592a51f30d2 98311: 90519e4de572f2ebe2b280d1cf9e3829bff06e9b 98303: 8d3fd52306c01a77327e5a8547cc363fa60bb45f v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_cp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 42d3b035858e..b772a62f99ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45e519052e8f583a709edd442a23f59581d3fe42 +refs/heads/master: d7463eb41d88a39de2653fd41857c4ccddb8707b diff --git a/trunk/drivers/char/drm/radeon_cp.c b/trunk/drivers/char/drm/radeon_cp.c index 3a424986e85e..fc0820c2b4b4 100644 --- a/trunk/drivers/char/drm/radeon_cp.c +++ b/trunk/drivers/char/drm/radeon_cp.c @@ -472,6 +472,8 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev, #if __OS_HAS_AGP if (dev_priv->flags & RADEON_IS_AGP) { RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev->agp->base); + if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R200) + RADEON_WRITE(RADEON_AGP_BASE_2, 0); radeon_write_agp_location(dev_priv, (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & 0xffff0000) |