Fix up some incorrect pointers and clear screen

diff --git a/src/mesa/drivers/dri/i915/server/intel_dri.c b/src/mesa/drivers/dri/i915/server/intel_dri.c
index 6e32cb4177b89d5cbfe393ee9015ccaf4d3ba609..2fd4a13052fb5857ddf0fbb18d357059e03cf79e 100644 (file)
--- a/src/mesa/drivers/dri/i915/server/intel_dri.c
+++ b/src/mesa/drivers/dri/i915/server/intel_dri.c
@@ -617,13 +617,13 @@ static Bool
 I830ClearScreen(DRIDriverContext *ctx, I830Rec *pI830, drmI830Sarea *sarea)
 {
   /* need to drmMap front and back buffers and zero them */
-  drmAddressPtr map_addr;
+  drmAddress map_addr;
   int ret;
 
   ret = drmMap(ctx->drmFD,
               sarea->front_handle,
               sarea->front_size,
-              map_addr);
+              &map_addr);
 
   if (ret)
   {
@@ -640,7 +640,7 @@ I830ClearScreen(DRIDriverContext *ctx, I830Rec *pI830, drmI830Sarea *sarea)
   ret = drmMap(ctx->drmFD,
               sarea->back_handle,
               sarea->back_size,
-              map_addr);
+              &map_addr);
 
   if (ret)
   {
@@ -810,14 +810,14 @@ I830ScreenInit(DRIDriverContext *ctx, I830Rec *pI830)
    if (err == FALSE)
        return FALSE;
 
-   I830SetRingRegs(ctx, pI830);
-
    /* Quick hack to clear the front & back buffers.  Could also use
     * the clear ioctl to do this, but would need to setup hw state
     * first.
     */
    I830ClearScreen(ctx, pI830, pSAREAPriv);
 
+   I830SetRingRegs(ctx, pI830);
+
    return TRUE;
 }