1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index 08ed8d01d9d9..895152206b31 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -326,7 +326,8 @@ static void r128_cce_init_ring_buffer( drm_device_t *dev,
                 ring_start = dev_priv->cce_ring->offset - dev->agp->base;
         else
 #endif
-                ring_start = dev_priv->cce_ring->offset - dev->sg->handle;
+                ring_start = dev_priv->cce_ring->offset - 
+                                (unsigned long)dev->sg->virtual;
 
         R128_WRITE( R128_PM4_BUFFER_OFFSET, ring_start | R128_AGP_OFFSET );
 
@@ -487,6 +488,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
                 r128_do_cleanup_cce( dev );
                 return DRM_ERR(EINVAL);
         }
+        dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
         if(!dev->agp_buffer_map) {
                 DRM_ERROR("could not find dma buffer region!\n");
@@ -537,7 +539,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
                 dev_priv->cce_buffers_offset = dev->agp->base;
         else
 #endif
-                dev_priv->cce_buffers_offset = dev->sg->handle;
+                dev_priv->cce_buffers_offset = (unsigned long)dev->sg->virtual;
 
         dev_priv->ring.start = (u32 *)dev_priv->cce_ring->handle;
         dev_priv->ring.end = ((u32 *)dev_priv->cce_ring->handle