From 050b77a9ac45afc5c3acb4d018f1d4858c2f4cc7 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 22 Mar 2005 14:25:55 +0000 Subject: merge unichrome changes from branch --- src/mesa/drivers/dri/unichrome/server/via_dri.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/unichrome/server') diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c index 72735abc82..b8c8ffc68e 100644 --- a/src/mesa/drivers/dri/unichrome/server/via_dri.c +++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c @@ -317,7 +317,7 @@ static int VIADRIScreenInit(DRIDriverContext * ctx) #if 0 ctx->shared.SAREASize = ((sizeof(drm_sarea_t) + 0xfff) & 0x1000); #else - if (sizeof(drm_sarea_t)+sizeof(VIASAREAPriv) > SAREA_MAX) { + if (sizeof(drm_sarea_t)+sizeof(drm_via_sarea_t) > SAREA_MAX) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Data does not fit in SAREA\n"); return GL_FALSE; @@ -446,10 +446,6 @@ static int VIADRIScreenInit(DRIDriverContext * ctx) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[dri] frame buffer initialized.\n" ); - /*pVIADRI->drixinerama = pVia->drixinerama;*/ - /*=* John Sheng [2003.12.9] Tuxracer & VQ *=*/ - pVIADRI->VQEnable = pVia->VQEnable; - return VIADRIFinishScreenInit(ctx); } @@ -503,13 +499,13 @@ VIADRIFinishScreenInit(DRIDriverContext * ctx) /* set SAREA value */ { - VIASAREAPriv *saPriv; + drm_via_sarea_t *saPriv; - saPriv=(VIASAREAPriv*)(((char*)ctx->pSAREA) + + saPriv=(drm_via_sarea_t*)(((char*)ctx->pSAREA) + sizeof(drm_sarea_t)); assert(saPriv); memset(saPriv, 0, sizeof(*saPriv)); - saPriv->CtxOwner = -1; + saPriv->ctxOwner = -1; } pVIADRI=(VIADRIPtr)pVia->devPrivate; pVIADRI->deviceID=pVia->Chipset; @@ -1218,7 +1214,7 @@ static int viaInitFBDev(DRIDriverContext *ctx) pVia->FBFreeStart = ctx->shared.virtualWidth * ctx->cpp * ctx->shared.virtualHeight; -#if 0 +#if 1 /* Alloc a second framebuffer for the second head */ pVia->FBFreeStart += ctx->shared.virtualWidth * ctx->cpp * ctx->shared.virtualHeight; -- cgit v1.2.3