[xserver-commit] xserver ChangeLog,3.82,3.83 Makefile.am,3.10,3.11 configure.ac,3.42,3.43

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver
In directory pdx:/home/anholt/xserver

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
Merge dri-0-1-branch to trunk.  Notable changes:
- Add libdrm and libdri.  Portions of the DRI extension are stubbed
  out.
- Use the DRM in the ATI driver when available.  This provides a
  minor performance improvement in x11perf, and opens the possibility
  of using the 3d hardware for acceleration in the future.
- Implement solid fill acceleration for Composite in KAA.
- Implement Blend hook for Composite and use it on r128.
- Fix a bug of mine that resulted in overuse of offscreen memory.
- Fix many miscellaneous bugs in ATI driver and add PCI IDs.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.82
retrieving revision 3.83
diff -u -d -r3.82 -r3.83
--- ChangeLog	28 Dec 2003 12:58:00 -0000	3.82
+++ ChangeLog	29 Dec 2003 06:23:59 -0000	3.83
@@ -1,3 +1,127 @@
+2003-12-28  Eric Anholt  <anholt@FreeBSD.org>
+
+	* Makefile.am:
+	* configure.ac:
+	* dri/.cvsignore:
+	* dri/Makefile.am:
+	* dri/dri.c: (DRIDrvMsg), (DRIScreenInit), (DRIFinishScreenInit),
+	(DRICloseScreen), (DRIExtensionInit), (DRIReset),
+	(DRIQueryDirectRenderingCapable), (DRIOpenConnection),
+	(DRIAuthConnection), (DRICloseConnection),
+	(DRIGetClientDriverName), (DRICreateContextPriv),
+	(DRICreateContextPrivFromHandle), (DRIDestroyContextPriv),
+	(DRICreateDummyContext), (DRIDestroyDummyContext),
+	(DRICreateContext), (DRIDestroyContext), (DRIContextPrivDelete),
+	(DRIClipNotifyAllDrawables), (DRITransitionToSharedBuffers),
+	(DRITransitionToPrivateBuffers), (DRITransitionTo3d),
+	(DRITransitionTo2d), (DRICreateDrawable), (DRIDestroyDrawable),
+	(DRIDrawablePrivDelete), (DRIGetDrawableInfo), (DRIGetDeviceInfo),
+	(DRICreateInfoRec), (DRIDestroyInfoRec), (DRIWakeupHandler),
+	(DRIBlockHandler), (DRIDoWakeupHandler), (DRIDoBlockHandler),
+	(DRISwapContext), (DRIGetContextStore), (DRIWindowExposures),
+	(DRITreeTraversal), (DRICopyWindow), (DRIGetSecs),
+	(DRIComputeMilliSeconds), (DRISpinLockTimeout), (DRILockTree),
+	(DRIValidateTree), (DRIPostValidateTree), (DRIClipNotify),
+	(DRIGetDrawableIndex), (DRIGetDrawableStamp),
+	(DRIPrintDrawableLock), (DRILock), (DRIUnlock),
+	(DRIGetSAREAPrivate), (DRIGetContext), (DRIGetWrappedFuncs),
+	(DRIQueryVersion), (_DRIAdjustFrame), (DRIAdjustFrame),
+	(DRIOpenFullScreen), (_DRICloseFullScreen), (DRICloseFullScreen),
+	(DRIMoveBuffersHelper):
+	* dri/dri.h:
+	* dri/dristruct.h:
+	* dri/sarea.h:
+	* dri/xf86dri.c: (XFree86DRIExtensionInit), (XF86DRIResetProc),
+	(ProcXF86DRIQueryVersion),
+	(ProcXF86DRIQueryDirectRenderingCapable),
+	(ProcXF86DRIOpenConnection), (ProcXF86DRIAuthConnection),
+	(ProcXF86DRICloseConnection), (ProcXF86DRIGetClientDriverName),
+	(ProcXF86DRICreateContext), (ProcXF86DRIDestroyContext),
+	(ProcXF86DRICreateDrawable), (ProcXF86DRIDestroyDrawable),
+	(ProcXF86DRIGetDrawableInfo), (ProcXF86DRIGetDeviceInfo),
+	(ProcXF86DRIOpenFullScreen), (ProcXF86DRICloseFullScreen),
+	(ProcXF86DRIDispatch), (SProcXF86DRIQueryVersion),
+	(SProcXF86DRIDispatch):
+	* dri/xf86dri.h:
+	* dri/xf86dristr.h:
+	* drm/.cvsignore:
+	* drm/Makefile.am:
+	* drm/drm.h:
+	* drm/drmhash.c: (HashHash), (HashCreate), (HashDestroy),
+	(HashFind), (HashLookup), (HashInsert), (HashDelete), (HashNext),
+	(HashFirst):
+	* drm/libdrm.c: (drmMsg), (drmMalloc), (drmFree), (drmStrdup),
+	(drmGetKeyFromFd), (drmGetEntry), (drmMatchBusID), (drmOpenDevice),
+	(drmOpenMinor), (drmAvailable), (drmOpenByBusid), (drmOpenByName),
+	(drmOpen), (drmFreeVersion), (drmFreeKernelVersion),
+	(drmCopyVersion), (drmGetVersion), (drmGetLibVersion),
+	(drmFreeBusid), (drmGetBusid), (drmSetBusid), (drmGetMagic),
+	(drmAuthMagic), (drmAddMap), (drmRmMap), (drmAddBufs),
+	(drmMarkBufs), (drmFreeBufs), (drmClose), (drmMap), (drmUnmap),
+	(drmGetBufInfo), (drmMapBufs), (drmUnmapBufs), (drmDMA),
+	(drmGetLock), (drmUnlock), (drmGetReservedContextList),
+	(drmFreeReservedContextList), (drmCreateContext),
+	(drmSwitchToContext), (drmSetContextFlags), (drmGetContextFlags),
+	(drmDestroyContext), (drmCreateDrawable), (drmDestroyDrawable),
+	(drmAgpAcquire), (drmAgpRelease), (drmAgpEnable), (drmAgpAlloc),
+	(drmAgpFree), (drmAgpBind), (drmAgpUnbind), (drmAgpVersionMajor),
+	(drmAgpVersionMinor), (drmAgpGetMode), (drmAgpBase), (drmAgpSize),
+	(drmAgpMemoryUsed), (drmAgpMemoryAvail), (drmAgpVendorId),
+	(drmAgpDeviceId), (drmScatterGatherAlloc), (drmScatterGatherFree),
+	(drmWaitVBlank), (drmError), (drmCtlInstHandler),
+	(drmCtlUninstHandler), (drmFinish), (drmGetInterruptFromBusID),
+	(drmAddContextTag), (drmDelContextTag), (drmGetContextTag),
+	(drmAddContextPrivateMapping), (drmGetContextPrivateMapping),
+	(drmGetMap), (drmGetClient), (drmGetStats),
+	(drmSetInterfaceVersion), (drmCommandNone), (drmCommandRead),
+	(drmCommandWrite), (drmCommandWriteRead):
+	* drm/libdrm.h:
+	* hw/kdrive/ati/Makefile.am:
+	* hw/kdrive/ati/ati.c: (make_busid), (ATICardInit),
+	(ATIScreenInit):
+	* hw/kdrive/ati/ati.h:
+	* hw/kdrive/ati/ati_draw.c: (ATIWaitAvailMMIO), (RadeonWaitIdle),
+	(R128WaitIdle), (ATIWaitIdle), (ATIDMAStart), (ATIDMAStop),
+	(ATIDMADispatchIndirect), (ATIDMAFlushIndirect), (ATIDMAGetBuffer),
+	(R128GetDatatypePict), (ATIGetDatatypeBpp), (ATIDoneSolid):
+	* hw/kdrive/ati/ati_draw.h:
+	* hw/kdrive/ati/ati_drawtmp.h:
+	* hw/kdrive/ati/ati_dri.c: (ATILog2), (ATIDRIInitGARTValues),
+	(ATIDRIAddAndMap), (ATIDRIAgpInit), (ATIDRIPciInit),
+	(R128DRIKernelInit), (RadeonDRIKernelInit), (ATIDRIBufInit),
+	(ATIDRIIrqInit), (ATIDRISwapContext), (ATIDRIScreenInit),
+	(R128DRIFinishScreenInit), (RadeonDRIFinishScreenInit),
+	(ATIDRIFinishScreenInit), (ATIDRICloseScreen):
+	* hw/kdrive/ati/ati_dri.h:
+	* hw/kdrive/ati/ati_dripriv.h:
+	* hw/kdrive/ati/ati_reg.h:
+	* hw/kdrive/ati/ati_sarea.h:
+	* hw/kdrive/ati/ati_stub.c: (InitCard):
+	* hw/kdrive/ati/r128_blendtmp.h:
+	* hw/kdrive/ati/r128_common.h:
+	* hw/kdrive/ati/r128_sarea.h:
+	* hw/kdrive/ati/radeon_common.h:
+	* hw/kdrive/ati/radeon_sarea.h:
+	* hw/kdrive/src/Makefile.am:
+	* hw/kdrive/src/kaa.c: (kaaPixmapAllocArea), (kaaMoveInPixmap),
+	(kaaCreatePixmap):
+	* hw/kdrive/src/kaa.h:
+	* hw/kdrive/src/kaapict.c: (kaaCompositeFallbackPictDesc),
+	(kaaPrintCompositeFallback), (kaaGetPixelFromRGBA),
+	(kaaGetRGBAFromPixel), (kaaComposite):
+	* hw/kdrive/src/kdrive.h:
+	* mi/miinitext.c:
+	Merge dri-0-1-branch to trunk.  Notable changes:
+	- Add libdrm and libdri.  Portions of the DRI extension are stubbed
+	  out.
+	- Use the DRM in the ATI driver when available.  This provides a
+	  minor performance improvement in x11perf, and opens the possibility
+	  of using the 3d hardware for acceleration in the future.
+	- Implement solid fill acceleration for Composite in KAA.
+	- Implement Blend hook for Composite and use it on r128.
+	- Fix a bug of mine that resulted in overuse of offscreen memory.
+	- Fix many miscellaneous bugs in ATI driver and add PCI IDs.
+
 2003-12-29  Jaymz Julian <jaymz@artificial-stupidity.net>
 	* fb/fbpict.c:
 	* fb/fbcompose.c:

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/Makefile.am,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- Makefile.am	11 Nov 2003 05:45:48 -0000	3.10
+++ Makefile.am	29 Dec 2003 06:23:59 -0000	3.11
@@ -1,4 +1,9 @@
 AUTOMAKE_OPTIONS=dist-bzip2
+
+if DRI
+DRI_SUBDIRS=	drm dri
+endif
+
 if COMPOSITE
 COMPOSITE_SUBDIR = composite
 endif
@@ -15,6 +20,7 @@
 	render  \
 	xfixes  \
 	damageext \
+	$(DRI_SUBDIRS) \
 	$(COMPOSITE_SUBDIR) \
 	hw
 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.42
retrieving revision 3.43
diff -u -d -r3.42 -r3.43
--- configure.ac	18 Dec 2003 12:19:47 -0000	3.42
+++ configure.ac	29 Dec 2003 06:23:59 -0000	3.43
@@ -99,6 +99,7 @@
 			     [SCREENSAVER=yes])
 AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=auto])
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
+AC_ARG_ENABLE(dri,           [  --disable-dri ],[DRI=$enableval],[DRI=no])
 
 AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
 				[FONTPATH="$withval"],
@@ -157,6 +158,12 @@
 	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
 fi
 
+AM_CONDITIONAL(DRI, test x$DRI = xyes)
+if test "$DRI" = yes; then
+	AC_DEFINE(XF86DRI,1,[Build DRI extension])
+	AC_DEFINE(_XF86DRI_SERVER_,1,[XF86DRI internal define])
+fi
+
 PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
 
 if test "$have_libxdmcp" = yes; then
@@ -355,6 +362,8 @@
 Makefile
 include/Makefile
 dix/Makefile
+dri/Makefile
+drm/Makefile
 fb/Makefile
 mi/Makefile
 miext/Makefile