From ab8d6a236f61b44cf8edbfa9f6511592a51f30d2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 28 May 2008 11:27:01 +1000 Subject: [PATCH] --- yaml --- r: 98315 b: refs/heads/master c: fa0d71b967506031f7cb08ced6095d1c4f988594 h: refs/heads/master i: 98313: c708408602f29e48cc1b03361a1e1ecd575ed086 98311: 90519e4de572f2ebe2b280d1cf9e3829bff06e9b v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_cp.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4321d8e3777e..e939ef1f5ffa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f18409ea3d778a171a9505c0a849d846f352bd0 +refs/heads/master: fa0d71b967506031f7cb08ced6095d1c4f988594 diff --git a/trunk/drivers/char/drm/radeon_cp.c b/trunk/drivers/char/drm/radeon_cp.c index d8ede40de0b0..1e434ba15564 100644 --- a/trunk/drivers/char/drm/radeon_cp.c +++ b/trunk/drivers/char/drm/radeon_cp.c @@ -659,8 +659,9 @@ static void radeon_set_rs690gart(drm_radeon_private_t *dev_priv, int on) temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_FEATURE_ID); RS690_WRITE_MCIND(RS690_MC_GART_FEATURE_ID, 0x42040800); - RS690_WRITE_MCIND(RS690_MC_GART_BASE, - dev_priv->gart_info.bus_addr); + temp = dev_priv->gart_info.bus_addr & 0xfffff000; + temp |= (upper_32_bits(dev_priv->gart_info.bus_addr) & 0xff) << 4; + RS690_WRITE_MCIND(RS690_MC_GART_BASE, temp); temp = RS690_READ_MCIND(dev_priv, RS690_MC_AGP_MODE_CONTROL); RS690_WRITE_MCIND(RS690_MC_AGP_MODE_CONTROL, 0x01400000);