diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/fb/fb_dri.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r128/server/r128_dri.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/server/radeon_dri.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 29558c9e291..fa1bc2993fb 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -1,7 +1,5 @@ # -*-makefile-*- -TOP = ../../../../.. - MESA_MODULES = $(TOP)/src/mesa/mesa.a @@ -36,7 +34,7 @@ endif ### Include directories SHARED_INCLUDES = \ -I. \ - -I../common \ + -I$(TOP)/src/mesa/drivers/dri/common \ -Iserver \ -I$(DRM_SOURCE_PATH)/shared \ -I$(TOP)/include \ @@ -75,7 +73,7 @@ default: depend symlinks $(LIB_DIR)/$(LIBNAME) # $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS) -$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile ../Makefile.template +$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(GL_LIB_DEPS) diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c index d5ea98b5be4..97f4e34f156 100644 --- a/src/mesa/drivers/dri/fb/fb_dri.c +++ b/src/mesa/drivers/dri/fb/fb_dri.c @@ -657,7 +657,7 @@ __driInitFBDev( struct DRIDriverContextRec *ctx ) ctx->shared.hFrameBuffer = ctx->FBStart; ctx->shared.fbSize = ctx->FBSize; ctx->shared.hSAREA = 0xB37D; - ctx->shared.SAREASize = DRM_PAGE_SIZE; + ctx->shared.SAREASize = SAREA_MAX; id = shmget(ctx->shared.hSAREA, ctx->shared.SAREASize, IPC_CREAT | IPC_EXCL | S_IRUSR | S_IWUSR); if (id == -1) { /* segment will already exist if previous server segfaulted */ @@ -672,7 +672,7 @@ __driInitFBDev( struct DRIDriverContextRec *ctx ) fprintf(stderr, "fb: shmat failed\n"); return 0; } - memset(ctx->pSAREA, 0, DRM_PAGE_SIZE); + memset(ctx->pSAREA, 0, SAREA_MAX); return 1; } diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.c b/src/mesa/drivers/dri/r128/server/r128_dri.c index 6d577483cc0..fff2549aefb 100644 --- a/src/mesa/drivers/dri/r128/server/r128_dri.c +++ b/src/mesa/drivers/dri/r128/server/r128_dri.c @@ -747,7 +747,7 @@ static GLboolean R128DRIScreenInit(DRIDriverContext *ctx) } info->registerSize = ctx->MMIOSize; - ctx->shared.SAREASize = DRM_PAGE_SIZE; + ctx->shared.SAREASize = SAREA_MAX; /* Note that drmOpen will try to load the kernel module, if needed. */ ctx->drmFD = drmOpen("r128", NULL ); diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.c b/src/mesa/drivers/dri/radeon/server/radeon_dri.c index 6521ea81248..b7e8026c5a3 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.c +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.c @@ -767,7 +767,7 @@ static int RADEONScreenInit( DRIDriverContext *ctx, RADEONInfoPtr info ) } info->registerSize = ctx->MMIOSize; - ctx->shared.SAREASize = DRM_PAGE_SIZE; + ctx->shared.SAREASize = SAREA_MAX; /* Note that drmOpen will try to load the kernel module, if needed. */ ctx->drmFD = drmOpen("radeon", NULL ); |