Attachment 3076 Details for Bug 4277 – DDX: make via_dri.h more acceptable for DRI inclusion.

[patch] DDX: make via_dri.h more acceptable for DRI inclusion.

ddx.diff (text/plain), 4.21 KB, created by Luc Verhaegen on 2005-08-28 07:12:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luc Verhaegen

Created: 2005-08-28 07:12:12 UTC

Size: 4.21 KB

patch

obsolete

>? Makefile
>Index: via_dri.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.c,v
>retrieving revision 1.17
>diff -u -r1.17 via_dri.c
>--- via_dri.c	15 Aug 2005 07:30:06 -0000	1.17
>+++ via_dri.c	28 Aug 2005 12:15:08 -0000
>@@ -662,7 +662,7 @@
>     /* For now the mapping works by using a fixed size defined
>     * in the SAREA header
>     */
>-    if (sizeof(XF86DRISAREARec)+sizeof(VIASAREAPriv) > SAREA_MAX) {
>+    if (sizeof(XF86DRISAREARec)+sizeof(drm_via_sarea_t) > SAREA_MAX) {
> 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Data does not fit in SAREA\n");
> 	DRIDestroyInfoRec(pVia->pDRIInfo);
> 	pVia->pDRIInfo = NULL;
>@@ -712,8 +712,8 @@
>     }
>     pVIADRI->regs.size = VIA_MMIO_REGSIZE;
>     pVIADRI->regs.handle = pVia->registerHandle;
>-    xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] mmio Registers = 0x%08x\n",
>-	pVIADRI->regs.handle);
>+    xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] mmio Registers = 0x%08lx\n",
>+               (unsigned long) pVIADRI->regs.handle);
>     
>     pVIADRI->drixinerama = pVia->drixinerama;
> 
>@@ -816,9 +816,9 @@
> 
>     /* set SAREA value */
>     {
>-	VIASAREAPriv *saPriv;
>+	drm_via_sarea_t *saPriv;
> 
>-	saPriv=(VIASAREAPriv*)DRIGetSAREAPrivate(pScreen);
>+	saPriv=(drm_via_sarea_t *)DRIGetSAREAPrivate(pScreen);
> 	assert(saPriv);
> 	memset(saPriv, 0, sizeof(*saPriv));
> 	saPriv->ctxOwner = -1;
>@@ -906,8 +906,8 @@
> 	return FALSE;
>     }
>     
>-    xf86DrvMsg(pScreen->myNum, X_INFO,
>-	"[drm] register handle = 0x%08x\n", pVia->registerHandle);
>+    xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] register handle = 0x%08lx\n",
>+               (unsigned long) pVia->registerHandle);
> 
>     return TRUE;
> }
>Index: via_dri.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_dri.h,v
>retrieving revision 1.8
>diff -u -r1.8 via_dri.h
>--- via_dri.h	15 Aug 2005 07:30:06 -0000	1.8
>+++ via_dri.h	28 Aug 2005 12:15:08 -0000
>@@ -21,21 +21,18 @@
>  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>  * DEALINGS IN THE SOFTWARE.
>  */
>-
>+/*
>+ * Keep this file in perfect sync between the ddx and dri drivers.
>+ *
>+ */
> #ifndef _VIA_DRI_H_
> #define _VIA_DRI_H_ 1
> 
>-#include "drm.h"
>-#include "xf86drm.h"
>-#include "via_drm.h"
>-
> #define VIA_MAX_DRAWABLES 256
> 
> #define VIA_DRI_VERSION_MAJOR		4
> #define VIA_DRI_VERSION_MINOR		1
> 
>-typedef drm_via_sarea_t VIASAREAPriv;
>-
> typedef struct {
>     drm_handle_t handle;
>     drmSize size;
>@@ -52,7 +49,11 @@
>     int priv2;
>     int fbOffset;
>     int fbSize;
>+#ifdef XFree86Server
>     Bool drixinerama;
>+#else
>+    char drixinerama;
>+#endif
>     int backOffset;
>     int depthOffset;
>     int textureOffset;
>@@ -72,17 +73,4 @@
>     int dummy;
> } VIADRIContextRec, *VIADRIContextPtr;
> 
>-#ifdef XFree86Server
>-
>-#include "screenint.h"
>-
>-Bool VIADRIScreenInit(ScreenPtr pScreen);
>-void VIADRICloseScreen(ScreenPtr pScreen);
>-Bool VIADRIFinishScreenInit(ScreenPtr pScreen);
>-void VIADRIRingBufferCleanup(ScrnInfoPtr pScrn);
>-Bool VIADRIRingBufferInit(ScrnInfoPtr pScrn);
>-
>-
>-
>-#endif /* XFree86Server */
> #endif /* _VIA_DRI_H_ */
>Index: via_driver.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.h,v
>retrieving revision 1.9
>diff -u -r1.9 via_driver.h
>--- via_driver.h	15 Aug 2005 07:30:06 -0000	1.9
>+++ via_driver.h	28 Aug 2005 12:15:08 -0000
>@@ -372,4 +372,12 @@
> /* via_i2c.c */
> void ViaI2CInit(ScrnInfoPtr pScrn);
> 
>+#ifdef XF86DRI
>+Bool VIADRIScreenInit(ScreenPtr pScreen);
>+void VIADRICloseScreen(ScreenPtr pScreen);
>+Bool VIADRIFinishScreenInit(ScreenPtr pScreen);
>+void VIADRIRingBufferCleanup(ScrnInfoPtr pScrn);
>+Bool VIADRIRingBufferInit(ScrnInfoPtr pScrn);
>+#endif /* XF86DRI */
>+
> #endif /* _VIA_DRIVER_H_ */
>Index: via_xvmc.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/via_xvmc.c,v
>retrieving revision 1.11
>diff -u -r1.11 via_xvmc.c
>--- via_xvmc.c	11 Jul 2005 02:30:07 -0000	1.11
>+++ via_xvmc.c	28 Aug 2005 12:15:09 -0000
>@@ -40,6 +40,7 @@
> #ifdef XF86DRI
> 
> #include "via.h"
>+#include "xf86drm.h"
> #include "via_dri.h"
> #include "via_driver.h"
> #include "via_id.h"

Actions: View | Splinter Review

Attachments on bug 4277: 3075 | 3076 | 3077 | 3604

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.