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);