Attachment 2363 Details for Bug 943 – Fix for Mesa DRI drivers.

[patch] Fix for Mesa DRI drivers.

diff.Mesa_head (text/plain), 14.94 KB, created by Egbert Eich on 2005-04-09 06:58:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-04-09 06:58:24 UTC

Size: 14.94 KB

patch

obsolete

>diff -rNu ../unpatched/Mesa/src/glx/mini/Makefile Mesa/src/glx/mini/Makefile
>--- ../unpatched/Mesa/src/glx/mini/Makefile	2005-01-11 23:43:45.000000000 +0100
>+++ Mesa/src/glx/mini/Makefile	2005-03-30 17:51:18.000000000 +0200
>@@ -36,7 +36,7 @@
> 	-I$(TOP)/src/mesa/swrast_setup \
> 	-I$(TOP)/src/mesa/drivers/dri/common \
> 	-I$(DRM_SOURCE_PATH)/libdrm \
>-	-I$(DRM_SOURCE_PATH)/shared
>+	-I$(DRM_SOURCE_PATH)/shared-core
> 
> 
> ##### RULES #####
>diff -rNu ../unpatched/Mesa/src/glx/x11/Makefile Mesa/src/glx/x11/Makefile
>--- ../unpatched/Mesa/src/glx/x11/Makefile	2005-02-25 23:46:30.000000000 +0100
>+++ Mesa/src/glx/x11/Makefile	2005-03-30 17:51:07.000000000 +0200
>@@ -67,7 +67,7 @@
> 	-I$(TOP)/src/mesa/swrast_setup \
> 	-I$(TOP)/src/mesa/drivers/dri/common \
> 	-I$(DRM_SOURCE_PATH)/libdrm \
>-	-I$(DRM_SOURCE_PATH)/shared \
>+	-I$(DRM_SOURCE_PATH)/shared-core \
> 	$(X11_INCLUDES)
> 
> 
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/Makefile.template Mesa/src/mesa/drivers/dri/Makefile.template
>--- ../unpatched/Mesa/src/mesa/drivers/dri/Makefile.template	2005-02-01 00:40:05.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/Makefile.template	2005-03-31 15:58:00.000000000 +0200
>@@ -69,7 +69,7 @@
> 
> $(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
> 	rm -f $@ 
>-	gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
>+	$(CC) -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
> 
> 
> $(LIB_DIR)/$(LIBNAME): $(LIBNAME)
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/Makefile Mesa/src/mesa/drivers/dri/dri_client/Makefile
>--- ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/Makefile	2005-01-07 11:35:51.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/dri_client/Makefile	2005-03-30 17:48:58.000000000 +0200
>@@ -19,7 +19,7 @@
> 
> INCLUDES = \
> 	-I$(TOP)/include \
>-	-I$(DRM_SOURCE_PATH)/shared \
>+	-I$(DRM_SOURCE_PATH)/shared-core \
> 	-I$(TOP)/include/GL/internal \
> 	-I$(TOP)/src/mesa \
> 	-I$(TOP)/src/mesa/main \
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h
>--- ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h	2005-02-14 07:57:27.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h	2005-03-24 21:51:41.000000000 +0100
>@@ -575,11 +575,11 @@
> extern int           drmAgpEnable(int fd, unsigned long mode);
> extern int           drmAgpAlloc(int fd, unsigned long size,
> 				 unsigned long type, unsigned long *address,
>-				 unsigned long *handle);
>-extern int           drmAgpFree(int fd, unsigned long handle);
>-extern int 	     drmAgpBind(int fd, unsigned long handle,
>+				 drm_handle_t *handle);
>+extern int           drmAgpFree(int fd, drm_handle_t handle);
>+extern int 	     drmAgpBind(int fd, drm_handle_t handle,
> 				unsigned long offset);
>-extern int           drmAgpUnbind(int fd, unsigned long handle);
>+extern int           drmAgpUnbind(int fd, drm_handle_t handle);
> 
> /* AGP/GART info: authenticated client and/or X */
> extern int           drmAgpVersionMajor(int fd);
>@@ -594,8 +594,8 @@
> 
> /* PCI scatter/gather support: X server (root) only */
> extern int           drmScatterGatherAlloc(int fd, unsigned long size,
>-					   unsigned long *handle);
>-extern int           drmScatterGatherFree(int fd, unsigned long handle);
>+					   drm_handle_t *handle);
>+extern int           drmScatterGatherFree(int fd, drm_handle_t handle);
> 
> extern int           drmWaitVBlank(int fd, drmVBlankPtr vbl);
> 
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/xf86drm.c Mesa/src/mesa/drivers/dri/dri_client/xf86drm.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/dri_client/xf86drm.c	2005-03-22 14:34:27.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/dri_client/xf86drm.c	2005-04-04 22:46:36.000000000 +0200
>@@ -900,7 +900,7 @@
> {
>     drm_map_t map;
> 
>-    map.handle = (void *)handle;
>+    map.handle = handle;
> 
>     if(ioctl(fd, DRM_IOCTL_RM_MAP, &map)) return -errno;
>     return 0;
>@@ -1045,7 +1045,7 @@
> {
>     static unsigned long pagesize_mask = 0;
> 
>-    if (fd < 0) return -EINVAL;
>+   if (fd < 0) return -EINVAL;
> 
>     if (!pagesize_mask)
> 	pagesize_mask = getpagesize() - 1;
>@@ -1503,7 +1503,7 @@
>  * arguments in a drm_agp_buffer structure.
>  */
> int drmAgpAlloc(int fd, unsigned long size, unsigned long type,
>-		unsigned long *address, unsigned long *handle)
>+		unsigned long *address, drm_handle_t *handle)
> {
>     drm_agp_buffer_t b;
> 
>@@ -1530,7 +1530,7 @@
>  * This function is a wrapper around the DRM_IOCTL_AGP_FREE ioctl, passing the
>  * argument in a drm_agp_buffer structure.
>  */
>-int drmAgpFree(int fd, unsigned long handle)
>+int drmAgpFree(int fd, drm_handle_t handle)
> {
>     drm_agp_buffer_t b;
> 
>@@ -1554,7 +1554,7 @@
>  * This function is a wrapper around the DRM_IOCTL_AGP_BIND ioctl, passing the
>  * argument in a drm_agp_binding structure.
>  */
>-int drmAgpBind(int fd, unsigned long handle, unsigned long offset)
>+int drmAgpBind(int fd, drm_handle_t handle, unsigned long offset)
> {
>     drm_agp_binding_t b;
> 
>@@ -1577,7 +1577,7 @@
>  * This function is a wrapper around the DRM_IOCTL_AGP_UNBIND ioctl, passing
>  * the argument in a drm_agp_binding structure.
>  */
>-int drmAgpUnbind(int fd, unsigned long handle)
>+int drmAgpUnbind(int fd, drm_handle_t handle)
> {
>     drm_agp_binding_t b;
> 
>@@ -1767,7 +1767,7 @@
>     return i.id_device;
> }
> 
>-int drmScatterGatherAlloc(int fd, unsigned long size, unsigned long *handle)
>+int drmScatterGatherAlloc(int fd, unsigned long size, drm_handle_t *handle)
> {
>     drm_scatter_gather_t sg;
> 
>@@ -1779,7 +1779,7 @@
>     return 0;
> }
> 
>-int drmScatterGatherFree(int fd, unsigned long handle)
>+int drmScatterGatherFree(int fd, drm_handle_t handle)
> {
>     drm_scatter_gather_t sg;
> 
>@@ -1946,7 +1946,7 @@
>     drm_ctx_priv_map_t map;
> 
>     map.ctx_id = ctx_id;
>-    map.handle = (void *)handle;
>+    map.handle = handle;
> 
>     if (ioctl(fd, DRM_IOCTL_SET_SAREA_CTX, &map)) return -errno;
>     return 0;
>@@ -1976,7 +1976,7 @@
>     *size   = map.size;
>     *type   = map.type;
>     *flags  = map.flags;
>-    *handle = (unsigned long)map.handle;
>+    *handle = (drm_handle_t)map.handle;
>     *mtrr   = map.mtrr;
>     return 0;
> }
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.c Mesa/src/mesa/drivers/dri/i810/server/i810_dri.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.c	2004-07-10 21:14:18.000000000 +0200
>+++ Mesa/src/mesa/drivers/dri/i810/server/i810_dri.c	2005-03-29 13:09:24.000000000 +0200
>@@ -212,7 +212,7 @@
>    drmAgpAlloc(ctx->drmFD, 4096 * 1024, 1, NULL, &dcacheHandle);
>    info->dcacheHandle = dcacheHandle;
>    
>-   fprintf(stderr, "[agp] dcacheHandle : %p\n", dcacheHandle);
>+   fprintf(stderr, "[agp] dcacheHandle : 0x%x\n", dcacheHandle);
> 
> #define Elements(x) sizeof(x)/sizeof(*x)
>    for (pitch_idx = 0; pitch_idx < Elements(i810_pitches); pitch_idx++)
>@@ -710,7 +710,7 @@
>       return 0;
>    }
>    fprintf(stderr,
>-	   "[drm] register handle = 0x%08lx\n", info->regs);
>+	   "[drm] register handle = 0x%08x\n", info->regs);
> 
>    I810DRIAgpPreInit(ctx, info);
>    /* Need to AddMap the framebuffer and mmio regions here:
>@@ -730,7 +730,7 @@
>       return 0;
>    }
> 
>-   fprintf(stderr, "[drm] framebuffer handle = 0x%08lx\n",
>+   fprintf(stderr, "[drm] framebuffer handle = 0x%08x\n",
> 	   ctx->shared.hFrameBuffer);
> 
>    /* Check the i810 DRM version */
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c	2004-12-16 01:23:47.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c	2005-04-05 21:26:38.000000000 +0200
>@@ -612,8 +612,7 @@
>    _tnl_allow_pixel_fog( ctx, GL_FALSE );
>    _tnl_allow_vertex_fog( ctx, GL_TRUE );
> 
>-   mmesa->primary_offset = mmesa->mgaScreen->primary.handle;
>-
>+   mmesa->primary_offset = drmAgpBase(sPriv->fd);
>    ctx->DriverCtx = (void *) mmesa;
>    mmesa->glCtx = ctx;
> 
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.c Mesa/src/mesa/drivers/dri/mga/server/mga_dri.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.c	2005-03-05 07:38:59.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/mga/server/mga_dri.c	2005-03-29 13:11:51.000000000 +0200
>@@ -205,7 +205,7 @@
>       return 0;
>    }
>    fprintf( stderr,
>-	       "[agp] WARP microcode handle = 0x%08lx\n",
>+	       "[agp] WARP microcode handle = 0x%08x\n",
> 	       pMga->warp.handle );
> 
>    if ( drmMap( ctx->drmFD,
>@@ -232,7 +232,7 @@
>       return 0;
>    }
>    fprintf( stderr,
>-	       "[agp] Primary DMA handle = 0x%08lx\n",
>+	       "[agp] Primary DMA handle = 0x%08x\n",
> 	       pMga->primary.handle );
> 
>    if ( drmMap( ctx->drmFD,
>@@ -259,7 +259,7 @@
>       return 0;
>    }
>    fprintf( stderr,
>-	       "[agp] DMA buffers handle = 0x%08lx\n",
>+	       "[agp] DMA buffers handle = 0x%08x\n",
> 	       pMga->buffers.handle );
> 
>    if ( drmMap( ctx->drmFD,
>@@ -303,7 +303,7 @@
>    }
> /* should i map it ? */
>    fprintf( stderr,
>-               "[agp] agpTexture handle = 0x%08lx\n",
>+               "[agp] agpTexture handle = 0x%08x\n",
>                pMga->agpTextures.handle );
>    fprintf( stderr,
>                "[agp] agpTexture size: %d kb\n", pMga->agpTextures.size/1024 );
>@@ -338,7 +338,7 @@
>       return 0;
>    }
>    fprintf( stderr,
>-	       "[drm] Status handle = 0x%08lx\n",
>+	       "[drm] Status handle = 0x%08x\n",
> 	       pMga->status.handle );
> 
>    if ( drmMap( ctx->drmFD,
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h
>--- ../unpatched/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h	2004-03-12 06:22:15.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h	2005-04-05 20:51:26.000000000 +0200
>@@ -43,6 +43,12 @@
>  */
> #define MGA_BUFFER_ALIGN	0x00000fff
> 
>+typedef struct _mgaDrmRegion {
>+    drm_handle_t     handle;
>+    unsigned int  offset;
>+    drmSize       size;
>+} mgaDrmRegion, *mgaDrmRegionPtr;
>+
> typedef struct {
>    int chipset;
>    int width;
>@@ -75,10 +81,10 @@
> 
>    unsigned int mAccess;
> 
>-   drmRegion registers;
>-   drmRegion status;
>-   drmRegion primary;
>-   drmRegion buffers;
>+   mgaDrmRegion registers;
>+   mgaDrmRegion status;
>+   mgaDrmRegion primary;
>+   mgaDrmRegion buffers;
>    unsigned int sarea_priv_offset;
> } MGADRIRec, *MGADRIPtr;
> 
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/r128/server/r128_dri.c Mesa/src/mesa/drivers/dri/r128/server/r128_dri.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/r128/server/r128_dri.c	2005-03-05 07:38:59.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/r128/server/r128_dri.c	2005-03-29 13:06:08.000000000 +0200
>@@ -164,7 +164,7 @@
> 	return GL_FALSE;
>     }
>     fprintf(stderr,
>-	       "[agp] ring handle = 0x%08lx\n", info->ringHandle);
>+	       "[agp] ring handle = 0x%08x\n", info->ringHandle);
> 
>     if (drmMap(ctx->drmFD, info->ringHandle, info->ringMapSize,
> 	       (drmAddressPtr)&info->ring) < 0) {
>@@ -182,7 +182,7 @@
> 	return GL_FALSE;
>     }
>     fprintf(stderr,
>-	       "[agp] ring read ptr handle = 0x%08lx\n",
>+	       "[agp] ring read ptr handle = 0x%08x\n",
> 	       info->ringReadPtrHandle);
> 
>     if (drmMap(ctx->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
>@@ -398,7 +398,7 @@
> 	return GL_FALSE;
>     }
>     fprintf(stderr,
>-	       "[drm] register handle = 0x%08lx\n", info->registerHandle);
>+	       "[drm] register handle = 0x%08x\n", info->registerHandle);
> 
>     return GL_TRUE;
> }
>@@ -770,7 +770,7 @@
>       return 0;
>    }
> 
>-   fprintf(stderr, "[drm] framebuffer handle = 0x%08lx\n",
>+   fprintf(stderr, "[drm] framebuffer handle = 0x%08x\n",
> 	   ctx->shared.hFrameBuffer);
> 
>    if (!R128MemoryInit(ctx))
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.c Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.c	2005-03-05 07:38:59.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.c	2005-03-29 13:03:24.000000000 +0200
>@@ -381,7 +381,7 @@
>       fprintf(stderr, "[gart] Could not add ring mapping\n");
>       return 0;
>    }
>-   fprintf(stderr, "[gart] ring handle = 0x%08lx\n", info->ringHandle);
>+   fprintf(stderr, "[gart] ring handle = 0x%08x\n", info->ringHandle);
>     
> 
>    if (drmAddMap(ctx->drmFD, info->ringReadOffset, info->ringReadMapSize,
>@@ -392,7 +392,7 @@
>    }
>     
>    fprintf(stderr,
>-	   "[gart] ring read ptr handle = 0x%08lx\n",
>+	   "[gart] ring read ptr handle = 0x%08x\n",
> 	   info->ringReadPtrHandle);
>     
>    if (drmAddMap(ctx->drmFD, info->bufStart, info->bufMapSize,
>@@ -402,7 +402,7 @@
>       return 0;
>    }
>    fprintf(stderr,
>-	   "[gart] vertex/indirect buffers handle = 0x%08lx\n",
>+	   "[gart] vertex/indirect buffers handle = 0x%08x\n",
> 	   info->bufHandle);
> 
>    if (drmAddMap(ctx->drmFD, info->gartTexStart, info->gartTexMapSize,
>@@ -412,7 +412,7 @@
>       return 0;
>    }
>    fprintf(stderr,
>-	   "[gart] AGP texture map handle = 0x%08lx\n",
>+	   "[gart] AGP texture map handle = 0x%08x\n",
> 	   info->gartTexHandle);
> 
>    /* Initialize Radeon's AGP registers */
>@@ -469,7 +469,7 @@
> 	return 0;
>     }
>     fprintf(stderr,
>-	       "[pci] ring handle = 0x%08lx\n", info->ringHandle);
>+	       "[pci] ring handle = 0x%08x\n", info->ringHandle);
> 
>     if (drmAddMap(ctx->drmFD, info->ringReadOffset, info->ringReadMapSize,
> 		  DRM_SCATTER_GATHER, flags, &info->ringReadPtrHandle) < 0) {
>@@ -478,7 +478,7 @@
> 	return 0;
>     }
>     fprintf(stderr,
>-	       "[pci] ring read ptr handle = 0x%08lx\n",
>+	       "[pci] ring read ptr handle = 0x%08x\n",
> 	       info->ringReadPtrHandle);
> 
>     if (drmAddMap(ctx->drmFD, info->bufStart, info->bufMapSize,
>@@ -488,7 +488,7 @@
> 	return 0;
>     }
>     fprintf(stderr,
>-	       "[pci] vertex/indirect buffers handle = 0x%08lx\n",
>+	       "[pci] vertex/indirect buffers handle = 0x%08x\n",
> 	       info->bufHandle);
> 
>     if (drmAddMap(ctx->drmFD, info->gartTexStart, info->gartTexMapSize,
>@@ -498,7 +498,7 @@
> 	return 0;
>     }
>     fprintf(stderr,
>-	       "[pci] GART texture map handle = 0x%08lx\n",
>+	       "[pci] GART texture map handle = 0x%08x\n",
> 	       info->gartTexHandle);
> 
>     return 1;
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
>--- ../unpatched/Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c	2005-03-29 13:14:55.000000000 +0200
>+++ Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c	2005-03-24 21:41:30.000000000 +0100
>@@ -287,7 +287,7 @@
>       return 0;
>    }
>    fprintf(stderr,
>-	   "[drm] register handle = 0x%08x\n", pTDFX->regs);
>+	   "[drm] register handle = 0x%08lx\n", pTDFX->regs);
> 
> 
>    /* Create a 'server' context so we can grab the lock for
>diff -rNu ../unpatched/Mesa/src/mesa/drivers/dri/x11/Makefile Mesa/src/mesa/drivers/dri/x11/Makefile
>--- ../unpatched/Mesa/src/mesa/drivers/dri/x11/Makefile	2005-01-11 23:43:45.000000000 +0100
>+++ Mesa/src/mesa/drivers/dri/x11/Makefile	2005-03-30 17:49:47.000000000 +0200
>@@ -28,7 +28,7 @@
> 	-I../dri_client/imports \
> 	-Iserver \
> 	-I$(TOP)/include \
>-	-I$(DRM_SOURCE_PATH)/shared \
>+	-I$(DRM_SOURCE_PATH)/shared-core \
> 	-I$(TOP)/src/mesa \
> 	-I$(TOP)/src/mesa/main \
> 	-I$(TOP)/src/mesa/glapi \

Actions: View | Splinter Review

Attachments on bug 943: 540 | 541 | 2011 | 2024 | 2025 | 2362 | 2363 | 2364 | 2418 | 2689 | 2691

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.