Module Name: xsrc
Committed By: snj
Date: Tue Dec 23 01:30:24 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c
xsrc/external/mit/xf86-video-radeonhd/dist/src [netbsd-7]: r6xx_accel.h
rhd_video.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #339):
external/mit/xf86-video-intel/dist/src/sna/kgem.c: patch
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.6
external/mit/xf86-video-radeonhd/dist/src/rhd_video.h: revision 1.2
external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h: revision 1.2
Nuke bogus redefinitions of uint32/64_t.
Fix format strings for uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.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-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.1
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 Thu Apr 3 03:59:19 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Tue Dec 23 01:30:24 2014
@@ -153,8 +153,12 @@ struct local_i915_gem_userptr {
uint64_t user_ptr;
uint64_t user_size;
uint32_t flags;
+#ifndef I915_USERPTR_READ_ONLY
#define I915_USERPTR_READ_ONLY (1<<0)
+#endif
+#ifndef I915_USERPTR_UNSYNCHRONIZED
#define I915_USERPTR_UNSYNCHRONIZED (1<<31)
+#endif
uint32_t handle;
};
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1 Thu Aug 21 08:42:51 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Tue Dec 23 01:30:24 2014
@@ -921,7 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, st
#if NV_TEST_FOR_KERNEL_DRIVER
if (pci_device_has_kernel_driver(dev)) {
xf86DrvMsg(0, X_ERROR,
- NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
+ NV_NAME ": The PCI device 0x%"PRIx32" (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
id, name, dev->bus, dev->domain, dev->dev, dev->func);
xf86DrvMsg(0, X_ERROR,
NV_NAME ": This driver cannot operate until it has been unloaded.\n");
@@ -934,11 +934,11 @@ NVPciProbe(DriverPtr drv, int entity, st
name = pci_device_get_device_name(dev);
if(name)
xf86DrvMsg(0, X_WARNING,
- NV_NAME ": Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
+ NV_NAME ": Ignoring unsupported device 0x%"PRIx32" (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n",
id, name, dev->bus, dev->domain, dev->dev, dev->func);
else
xf86DrvMsg(0, X_WARNING,
- NV_NAME ": Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n",
+ NV_NAME ": Ignoring unsupported device 0x%"PRIx32" at %2.2d@%2.2d:%2.2d:%1.1d\n",
id, dev->bus, dev->domain, dev->dev, dev->func);
return FALSE;
}
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2 xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2.10.1
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2 Mon Nov 9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h Tue Dec 23 01:30:24 2014
@@ -3,10 +3,6 @@
#include "xf86drm.h"
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
/* r600_exa.c */
Bool R6xxEXAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
void R6xxEXACloseScreen(ScreenPtr pScreen);
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3 xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3.10.1
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3 Mon Nov 9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h Tue Dec 23 01:30:24 2014
@@ -26,10 +26,6 @@
#ifndef _RHD_VIDEO_H
#define _RHD_VIDEO_H
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
enum RHDXvColorSpace {
RHD_XV_COLOR_SPACE_AUTODETECT,
RHD_XV_COLOR_SPACE_REC601,
