CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2016-08-27 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sat Aug 27 16:35:48 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c

Log Message:
Since CARD32 and uint32_t don't necessarily use the same underlaying
type, e.g. on i386, add an explicit cast as well.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.5 xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.6
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.5	Sun Aug 21 18:18:57 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c	Sat Aug 27 16:35:48 2016
@@ -815,11 +815,11 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr 
 Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
 DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 "Base Address: 0x%"PRIx32"x\n",
-Base));
+(uint32_t)Base));
 Base = (Base + drmmode->front_bo->offset) >> 1;
 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 "DRI Base Address: 0x%"PRIx32"\n",
-Base);
+(uint32_t)Base);
 
 hwp->writeCrtc(hwp, 0x0D, Base & 0xFF);
 hwp->writeCrtc(hwp, 0x0C, (Base & 0xFF00) >> 8);
@@ -2046,11 +2046,11 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr 
 Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
 DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 "Base Address: 0x%"PRIx32"\n",
-Base));
+(uint32_t)Base));
 Base = (Base + drmmode->front_bo->offset) >> 3;
 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 "DRI Base Address: 0x%"PRIx32"\n",
-Base);
+(uint32_t)Base);
 
 tmp = hwp->readCrtc(hwp, 0x62) & 0x01;
 tmp |= (Base & 0x7F) << 1;

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2016-08-21 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sun Aug 21 18:18:57 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c

Log Message:
Fix format strings.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.4 xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.5
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.4	Fri Aug 19 23:53:25 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c	Sun Aug 21 18:18:57 2016
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include 
 #include "via_driver.h"
 
 /*
@@ -813,11 +814,11 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr 
 
 Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
 DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-"Base Address: 0x%lx\n",
+"Base Address: 0x%"PRIx32"x\n",
 Base));
 Base = (Base + drmmode->front_bo->offset) >> 1;
 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-"DRI Base Address: 0x%lx\n",
+"DRI Base Address: 0x%"PRIx32"\n",
 Base);
 
 hwp->writeCrtc(hwp, 0x0D, Base & 0xFF);
@@ -2044,11 +2045,11 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr 
 
 Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
 DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-"Base Address: 0x%lx\n",
+"Base Address: 0x%"PRIx32"\n",
 Base));
 Base = (Base + drmmode->front_bo->offset) >> 3;
 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-"DRI Base Address: 0x%lx\n",
+"DRI Base Address: 0x%"PRIx32"\n",
 Base);
 
 tmp = hwp->readCrtc(hwp, 0x62) & 0x01;

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2016-08-20 Thread Jonathan A. Kollasch 
Module Name:xsrc
Committed By:   jakllsch
Date:   Sat Aug 20 08:29:36 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_ums.c

Log Message:
align format string with argument type


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.3 xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.4
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.3	Fri Aug 19 23:53:25 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c	Sat Aug 20 08:29:36 2016
@@ -187,7 +187,7 @@ viaMapMMIO(ScrnInfoPtr pScrn)
 
 xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Mapping the frame buffer at address 0x%lX with "
-   "size %u KB.\n",
+   "size %lu KB.\n",
pVia->FrameBufferBase, pVia->videoRambytes / 1024);
 
 #ifdef HAVE_PCIACCESS

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2016-08-19 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 19 23:47:02 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_ums.c

Log Message:
include "xf86fbman.h"


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.1.1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c:1.1.1.2	Fri Aug 19 23:31:24 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c	Fri Aug 19 23:47:01 2016
@@ -28,6 +28,7 @@
 
 #include "globals.h"
 #include "via_driver.h"
+#include "xf86fbman.h"
 
 static void
 ViaMMIODisable(ScrnInfoPtr pScrn)

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2013-06-28 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Fri Jun 28 16:53:55 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.c

Log Message:
Use correct format string.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.1.1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c:1.1.1.2	Sat Jun  1 21:08:53 2013
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c	Fri Jun 28 16:53:55 2013
@@ -825,7 +825,7 @@ via_xf86crtc_resize(ScrnInfoPtr scrn, in
 goto fail;
 
 xf86DrvMsg(scrn-scrnIndex, X_INFO,
-Allocate new frame buffer %dx%d stride %d\n,
+Allocate new frame buffer %dx%d stride %lu\n,
 width, height, new_front-pitch);
 
 new_pixels = drm_bo_map(scrn, new_front);

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2013-06-04 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Tue Jun  4 16:59:25 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.h

Log Message:
Remove some prototypes (reduce diff to upstream) where I can't find
the corresponding functions.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.4 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.5
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.4	Sat Jun  1 21:21:16 2013
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h	Tue Jun  4 16:59:25 2013
@@ -520,14 +520,7 @@ Bool VIADRIBufferInit(ScrnInfoPtr pScrn)
 #endif /* HAVE_DRI */
 
 int viaOffScreenLinear(struct buffer_object *obj, ScrnInfoPtr pScrn, unsigned long size);
-void viaShowCursor(ScrnInfoPtr pScrn);
-void viaHideCursor(ScrnInfoPtr pScrn);
-Bool viaHWCursorInit(ScreenPtr pScreen);
-void ViaDisplaySetStreamOnCRT(ScrnInfoPtr pScrn, Bool primary);
 void ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool primary);
-void ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, Bool primary);
 void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
-void ViaDisplayEnableCRT(ScrnInfoPtr pScrn);
-void ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port);
 
 #endif /* _VIA_DRIVER_H_ */

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2013-06-03 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Mon Jun  3 22:44:40 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c

Log Message:
PR/47884: Brad Harder: Avoid variable stack allocation, use malloc for SSP.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.1.1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.1.1.2	Sat Jun  1 17:08:53 2013
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c	Mon Jun  3 18:44:40 2013
@@ -1002,9 +1002,13 @@ iga1_crtc_gamma_set(xf86CrtcPtr crtc, CA
 vgaHWPtr hwp = VGAHWPTR(pScrn);
 VIAPtr pVia = VIAPTR(pScrn);
 int SR1A, SR1B, CR67, CR6A;
-LOCO colors[size];
+LOCO *colors;
 int i;
 
+colors = malloc(size * sizeof(*colors));
+if (colors == NULL)
+	return;
+
 for (i = 0; i  size; i++) {
 colors[i].red = red[i]  8;
 colors[i].green = green[i]  8;
@@ -1039,6 +1043,7 @@ iga1_crtc_gamma_set(xf86CrtcPtr crtc, CA
 hwp-writeDacData(hwp, colors[i].blue);
 }
 }
+free(colors);
 }
 
 static void *
@@ -1413,8 +1418,12 @@ iga2_crtc_gamma_set(xf86CrtcPtr crtc, CA
 vgaHWPtr hwp = VGAHWPTR(pScrn);
 VIAPtr pVia = VIAPTR(pScrn);
 int SR1A, SR1B, CR67, CR6A;
-LOCO colors[size];
 int i;
+LOCO *colors;
+
+colors = malloc(size * sizeof(*colors));
+if (colors == NULL)
+	return;
 
 for (i = 0; i  size; i++) {
 colors[i].red = red[i]  8;
@@ -1473,6 +1482,7 @@ iga2_crtc_gamma_set(xf86CrtcPtr crtc, CA
 hwp-writeDacData(hwp, colors[i].blue);
 }
 }
+free(colors);
 }
 
 static void *

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2013-06-03 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Tue Jun  4 00:19:24 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_lvds.c

Log Message:
fix another useless (and incorrect) variable stack size allocation


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c:1.1.1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c:1.1.1.2	Sat Jun  1 17:08:53 2013
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c	Mon Jun  3 20:19:24 2013
@@ -1470,7 +1470,7 @@ static const xf86OutputFuncsRec via_lvds
 static void
 ViaPanelGetNativeModeFromOption(ScrnInfoPtr pScrn, ViaPanelInfoPtr panel, char *name)
 {
-char aux[strlen(name) + 1];
+char aux[256];
 CARD8 length, index;
 
 DEBUG(xf86DrvMsg(pScrn-scrnIndex, X_INFO,
@@ -1480,8 +1480,8 @@ ViaPanelGetNativeModeFromOption(ScrnInfo
 length = sizeof(ViaPanelNativeModes) / sizeof(ViaPanelModeRec);
 
 for (index = 0; index  length; index++) {
-sprintf(aux, %dx%d, ViaPanelNativeModes[index].Width,
-ViaPanelNativeModes[index].Height);
+snprintf(aux, sizeof(aux), %dx%d, ViaPanelNativeModes[index].Width,
+ ViaPanelNativeModes[index].Height);
 if (!xf86NameCmp(name, aux)) {
 panel-NativeModeIndex = index;
 panel-NativeWidth = ViaPanelNativeModes[index].Width;

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2013-06-01 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jun  1 21:21:16 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.h

Log Message:
make a prototype match the actual function.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.3 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.4
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.3	Sat Jun  1 21:11:27 2013
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h	Sat Jun  1 21:21:16 2013
@@ -519,7 +519,7 @@ Bool VIADRIBufferInit(ScrnInfoPtr pScrn)
 
 #endif /* HAVE_DRI */
 
-int viaOffScreenLinear(VIAMemPtr mem, ScrnInfoPtr pScrn, unsigned long size);
+int viaOffScreenLinear(struct buffer_object *obj, ScrnInfoPtr pScrn, unsigned long size);
 void viaShowCursor(ScrnInfoPtr pScrn);
 void viaHideCursor(ScrnInfoPtr pScrn);
 Bool viaHWCursorInit(ScreenPtr pScreen);

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2011-05-15 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun May 15 23:16:15 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_cursor.c
via_driver.h via_video.c

Log Message:
Add missing prototypes and fix calling args.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c:1.1.1.1	Thu May 27 03:31:59 2010
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c	Sun May 15 19:16:15 2011
@@ -39,8 +39,6 @@
 #include via_id.h
 #include cursorstr.h
 
-void viaShowCursor(ScrnInfoPtr pScrn);
-void viaHideCursor(ScrnInfoPtr pScrn);
 static void viaSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
 static Bool viaUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs);
 static Bool viaUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs);
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.1.1.1	Thu May 27 03:31:59 2010
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h	Sun May 15 19:16:15 2011
@@ -525,4 +525,15 @@
 
 #endif /* XF86DRI */
 
+int viaOffScreenLinear(VIAMemPtr mem, ScrnInfoPtr pScrn, unsigned long size);
+void viaShowCursor(ScrnInfoPtr pScrn);
+void viaHideCursor(ScrnInfoPtr pScrn);
+Bool viaHWCursorInit(ScreenPtr pScreen);
+void ViaDisplaySetStreamOnCRT(ScrnInfoPtr pScrn, Bool primary);
+void ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool primary);
+void ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, Bool primary);
+void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
+void ViaDisplayEnableCRT(ScrnInfoPtr pScrn);
+void ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port);
+
 #endif /* _VIA_DRIVER_H_ */
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.1.1.1	Thu May 27 03:31:58 2010
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c	Sun May 15 19:16:15 2011
@@ -51,6 +51,7 @@
 #include X11/extensions/Xv.h
 #include xaa.h
 #include xaalocal.h
+#include damage.h
 #include dixstruct.h
 #include via_xvpriv.h
 #include via_swov.h
@@ -757,7 +758,7 @@
 pBox++;
 }
 
-DamageDamageRegion(pPix, clipBoxes);
+DamageDamageRegion((DrawablePtr)pPix, clipBoxes);
 }
 
 return 0;

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2011-02-13 Thread Jared D. McNeill 
Module Name:xsrc
Committed By:   jmcneill
Date:   Sun Feb 13 20:06:20 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_memcpy.c

Log Message:
Remove a couple '#ifdef linux's to let the driver use optimized memcpy
functions on NetBSD for video copy. Gives nearly 2x performance on my
test system (previously kernel memcpy was always used):

CHROME(0): Benchmarking video copy.  Less time is better.
CHROME(0): Timed   libc YUV420 copy... 3000272. Throughput: 315.6 MiB/s.
CHROME(0): Timed kernel YUV420 copy... 3024946. Throughput: 313.0 MiB/s.
CHROME(0): TimedSSE YUV420 copy... 1591352. Throughput: 595.0 MiB/s.
CHROME(0): TimedMMX YUV420 copy... 2566279. Throughput: 369.0 MiB/s.
CHROME(0): Ditching 3DNow! YUV420 copy. Not supported by CPU.
CHROME(0): Timed   MMX2 YUV420 copy... 1696662. Throughput: 558.1 MiB/s.
CHROME(0): Using SSE YUV42X copy for video.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c:1.1.1.1	Thu May 27 07:31:58 2010
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c	Sun Feb 13 20:06:19 2011
@@ -311,8 +311,6 @@
 }
 
 
-#if !defined(__i386__) || (defined(linux)  defined(__i386__))
-
 static void
 libc_YUV42X(unsigned char *dst, const unsigned char *src,
 int dstPitch, int w, int h, int yuv422)
@@ -350,8 +348,6 @@
 }
 }
 }
-#endif
-
 
 #ifdef __i386__
 
@@ -417,7 +413,6 @@
 }
 }
 
-#ifdef linux
 PREFETCH_FUNC(sse, SSE, SSE,, FENCE)
 PREFETCH_FUNC(mmxext, MMXEXT, SSE, EMMS, FENCEMMS)
 PREFETCH_FUNC(now, MMX, NOW, FEMMS, FEMMS)
@@ -517,7 +512,6 @@
 }
 return 0;
 }
-#endif /* linux */
 
 /*
  * Benchmark the video copy routines and choose the fastest.
@@ -527,7 +521,6 @@
 {
 ScrnInfoPtr pScrn = xf86Screens[pScreen-myNum];
 
-#ifdef linux
 char buf[BSIZ];
 unsigned char *buf1, *buf2, *buf3;
 char *tmpBuf, *endBuf;
@@ -649,11 +642,6 @@
Using %s YUV42X copy for %s.\n,
mcFunctions[bestSoFar].mName, copyType);
 return mcFunctions[bestSoFar].mFunc;
-#else
-xf86DrvMsg(pScrn-scrnIndex, X_INFO,
-   Using Linux kernel memcpy for video.\n);
-return kernel_YUV42X;
-#endif /* linux */
 }
 
 #else

CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src

2011-01-20 Thread Jared D. McNeill 
Module Name:xsrc
Committed By:   jmcneill
Date:   Thu Jan 20 18:23:56 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_dri.c

Log Message:
Use DRICreatePCIBusID if present instead of building the Bus ID string
manually.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c:1.1.1.1	Thu May 27 07:31:59 2010
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c	Thu Jan 20 18:23:55 2011
@@ -599,17 +599,21 @@
 pDRIInfo-clientDriverName = VIAClientDriverName;
 break;
 }
-pDRIInfo-busIdString = xalloc(64);
-sprintf(pDRIInfo-busIdString, PCI:%d:%d:%d,
+if (xf86LoaderCheckSymbol(DRICreatePCIBusID)) {
+pDRIInfo-busIdString = DRICreatePCIBusID(pVia-PciInfo);
+} else {
+pDRIInfo-busIdString = xalloc(64);
+sprintf(pDRIInfo-busIdString, PCI:%d:%d:%d,
 #ifdef XSERVER_LIBPCIACCESS
-((pVia-PciInfo-domain  8) | pVia-PciInfo-bus),
-pVia-PciInfo-dev, pVia-PciInfo-func
+((pVia-PciInfo-domain  8) | pVia-PciInfo-bus),
+pVia-PciInfo-dev, pVia-PciInfo-func
 #else
-((pciConfigPtr)pVia-PciInfo-thisCard)-busnum,
-((pciConfigPtr)pVia-PciInfo-thisCard)-devnum,
-((pciConfigPtr)pVia-PciInfo-thisCard)-funcnum
+((pciConfigPtr)pVia-PciInfo-thisCard)-busnum,
+((pciConfigPtr)pVia-PciInfo-thisCard)-devnum,
+((pciConfigPtr)pVia-PciInfo-thisCard)-funcnum
 #endif
-   );
+   );
+}
 pDRIInfo-ddxDriverMajorVersion = VIA_DRIDDX_VERSION_MAJOR;
 pDRIInfo-ddxDriverMinorVersion = VIA_DRIDDX_VERSION_MINOR;
 pDRIInfo-ddxDriverPatchVersion = VIA_DRIDDX_VERSION_PATCH;