CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Sat Jun 27 17:09:59 UTC 2020
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: intel_module.c
Log Message:
Use UXA (not SNA) by default on Intel Gen3/4/5 chipsets (except 915).
This works around PR/54995 (screen corruption on N455)
and PR/55198 (X freezes/hangs on 965GM). Ok'ed by mrg@.
Should be pulled up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/intel_module.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-intel/dist/src/intel_module.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c:1.1.1.4 xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c:1.1.1.4 Wed Mar 20 06:34:02 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c Sat Jun 27 17:09:59 2020
@@ -567,9 +567,8 @@ _xf86findDriver(const char *ident, XF86C
return NULL;
}
-static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(void)
+static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(enum accel_method accel_method)
{
- enum accel_method accel_method = DEFAULT_ACCEL_METHOD;
XF86ConfDevicePtr dev;
if (hosted())
@@ -641,7 +640,17 @@ intel_scrn_create(DriverPtr driver,
#endif
#if KMS
- switch (get_accel_method()) {
+ enum accel_method default_accel_method = DEFAULT_ACCEL_METHOD;
+ /*
+ * XXX
+ * Use UXA by default for Gen3/4/5 chipsets (except 915) to avoid
+ * screen corruption etc. (PR/54995, PR/55198)
+ */
+ if ((unsigned)((struct intel_device_info *)match_data)->gen > 030 &&
+ (unsigned)((struct intel_device_info *)match_data)->gen < 060)
+ default_accel_method = UXA;
+
+ switch (get_accel_method(default_accel_method)) {
#if USE_SNA
case NOACCEL:
case SNA:
CVS commit: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 20 07:17:36 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c sna_accel.c xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c intel_driver.c Added Files: xsrc/external/mit/xf86-video-intel/dist: Makefile.in aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-intel/dist/benchmarks: Makefile.in xsrc/external/mit/xf86-video-intel/dist/libobj: Makefile.in xsrc/external/mit/xf86-video-intel/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/xf86-video-intel/dist/man: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/legacy: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/render_program: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/sna: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/sna/brw: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/sna/fb: Makefile.in xsrc/external/mit/xf86-video-intel/dist/src/uxa: Makefile.in xsrc/external/mit/xf86-video-intel/dist/test: Makefile.in xsrc/external/mit/xf86-video-intel/dist/tools: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/mc: Makefile.in xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/vld: Makefile.in Log Message: fix merge botches. re-add files autoconf files that the build sort of needs at least configure for. command used: % cd /usr/xsrc/external/mit/xf86-video-intel/dist % autoreconf -I m4 -I /usr/xsrc/external/mit/xorg-server/dist -i tested on sandy bridge and kaby lake. To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xf86-video-intel/dist/Makefile.in \ xsrc/external/mit/xf86-video-intel/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-intel/dist/compile \ xsrc/external/mit/xf86-video-intel/dist/config.guess \ xsrc/external/mit/xf86-video-intel/dist/config.h.in \ xsrc/external/mit/xf86-video-intel/dist/config.sub \ xsrc/external/mit/xf86-video-intel/dist/configure \ xsrc/external/mit/xf86-video-intel/dist/depcomp \ xsrc/external/mit/xf86-video-intel/dist/install-sh \ xsrc/external/mit/xf86-video-intel/dist/ltmain.sh \ xsrc/external/mit/xf86-video-intel/dist/missing cvs rdiff -u -r0 -r1.1 \ xsrc/external/mit/xf86-video-intel/dist/benchmarks/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/libobj/Makefile.in cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xf86-video-intel/dist/m4/libtool.m4 \ xsrc/external/mit/xf86-video-intel/dist/m4/ltoptions.m4 \ xsrc/external/mit/xf86-video-intel/dist/m4/ltsugar.m4 \ xsrc/external/mit/xf86-video-intel/dist/m4/ltversion.m4 \ xsrc/external/mit/xf86-video-intel/dist/m4/lt~obsolete.m4 cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/legacy/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/render_program/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/Makefile.in cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/brw/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/fb/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/Makefile.in cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/test/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/tools/Makefile.in cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/xvmc/Makefile.in cvs rdiff -u -r0 -r1.3 \
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: mrg Date: Mon Mar 18 02:12:36 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: intel_list.h Log Message: merge changes from xorg-server 1.20 list.h into this older version. fixes sandy bridge crashing problems for me. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/intel_list.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/intel_list.h diff -u xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h:1.1.1.2 Wed Nov 5 17:56:20 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/intel_list.h Mon Mar 18 02:12:36 2019 @@ -305,9 +305,20 @@ list_is_empty(const struct list *head) #define list_last_entry(ptr, type, member) \ list_entry((ptr)->prev, type, member) -#define __container_of(ptr, sample, member)\ -(void *)((char *)(ptr) \ - - ((char *)&(sample)->member - (char *)(sample))) +#ifdef HAVE_TYPEOF +#define __container_of(ptr, sample, member) \ +container_of(ptr, typeof(*sample), member) +#else +/* This implementation of __container_of has undefined behavior according + * to the C standard, but it works in many cases. If your compiler doesn't + * support typeof() and fails with this implementation, please try a newer + * compiler. + */ +#define __container_of(ptr, sample, member)\ +(void *)((char *)(ptr) \ +- ((char *)&(sample)->member - (char *)(sample))) +#endif + /** * Loop through the list given by head and set pos to struct in the list. * @@ -326,12 +337,14 @@ list_is_empty(const struct list *head) * */ #define list_for_each_entry(pos, head, member)\ -for (pos = __container_of((head)->next, pos, member); \ +for (pos = NULL,\ + pos = __container_of((head)->next, pos, member); \ >member != (head); \ pos = __container_of(pos->member.next, pos, member)) #define list_for_each_entry_reverse(pos, head, member)\ -for (pos = __container_of((head)->prev, pos, member); \ +for (pos = NULL,\ + pos = __container_of((head)->prev, pos, member); \ >member != (head); \ pos = __container_of(pos->member.prev, pos, member)) @@ -343,7 +356,8 @@ list_is_empty(const struct list *head) * See list_for_each_entry for more details. */ #define list_for_each_entry_safe(pos, tmp, head, member) \ -for (pos = __container_of((head)->next, pos, member), \ +for (pos = NULL,\ + pos = __container_of((head)->next, pos, member), \ tmp = __container_of(pos->member.next, pos, member); \ >member != (head); \ pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/uxa
Module Name:xsrc
Committed By: mrg
Date: Thu Jan 3 09:00:22 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c
Log Message:
avoid using an uninitialised variable.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_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-intel/dist/src/uxa/intel_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.2 Tue Jan 1 00:34:53 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c Thu Jan 3 09:00:22 2019
@@ -2079,7 +2079,7 @@ intel_pageflip_abort(ScrnInfoPtr scrn, x
#if HAVE_NOTIFY_FD
static void drmmode_notify_fd(int fd, int notify, void *data)
{
- struct intel_mode *mode;
+ struct intel_mode *mode = data;
drmHandleEvent(fd, >event_context);
}
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 28 08:45:20 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c
Log Message:
set mmap_arg.flags before calling DRM_IOCTL_I915_GEM_MMAP.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.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-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.5 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.6
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.5 Wed Jan 28 09:59:35 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Tue Aug 28 08:45:20 2018
@@ -527,6 +527,7 @@ retry:
mmap_arg.handle = bo->handle;
mmap_arg.offset = 0;
mmap_arg.size = bytes(bo);
+ mmap_arg.flags = 0;
if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, _arg))) {
assert(err != EINVAL);
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc Committed By: mrg Date: Thu Aug 18 18:48:58 UTC 2016 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_display.c Log Message: s/8/0x8/ and s/9/0x9/ to catch up with libdrm update. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_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-intel/dist/src/sna/sna_display.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.4 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.5 --- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.4 Wed Jan 28 09:59:35 2015 +++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Thu Aug 18 18:48:58 2016 @@ -5056,8 +5056,8 @@ sna_cursor_pre_init(struct sna *sna) return; #define LOCAL_IOCTL_GET_CAP DRM_IOWR(0x0c, struct local_get_cap) -#define DRM_CAP_CURSOR_WIDTH 8 -#define DRM_CAP_CURSOR_HEIGHT 9 +#define DRM_CAP_CURSOR_WIDTH 0x8 +#define DRM_CAP_CURSOR_HEIGHT 0x9 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: prlw1
Date: Wed Jan 28 09:59:35 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c sna_display.c
Log Message:
Remove differences with upstream xf86-video-intel which are no longer
necessary. (Use do_ioctl and mmap rather than drmIoct and drmMap.)
http://mail-index.netbsd.org/tech-x11/2015/01/25/msg001486.html
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_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-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.4 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.5
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.4 Fri Jan 16 21:32:11 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Wed Jan 28 09:59:35 2015
@@ -440,12 +440,7 @@ static void *__kgem_bo_map__gtt(struct k
VG_CLEAR(gtt);
retry_gtt:
gtt.handle = bo-handle;
-#ifdef __NetBSD__
- if (drmIoctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP_GTT, gtt)) {
- err = errno;
-#else
if ((err = do_ioctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP_GTT, gtt))) {
-#endif
assert(err != EINVAL);
(void)__kgem_throttle_retire(kgem, 0);
@@ -461,15 +456,10 @@ retry_gtt:
}
retry_mmap:
-#ifdef __NetBSD__
- err = -drmMap(kgem-fd, gtt.offset, bytes(bo), ptr);
- if (err) {
-#else
ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
kgem-fd, gtt.offset);
if (ptr == MAP_FAILED) {
err = errno;
-#endif
assert(err != EINVAL);
if (__kgem_throttle_retire(kgem, 0))
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.3 Fri Jan 16 21:32:11 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Wed Jan 28 09:59:35 2015
@@ -439,22 +439,14 @@ static void *gem_mmap(int fd, int handle
{
struct drm_i915_gem_mmap_gtt mmap_arg;
void *ptr;
-#ifdef __NetBSD__
- int err;
-#endif
VG_CLEAR(mmap_arg);
mmap_arg.handle = handle;
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, mmap_arg))
return NULL;
-#ifdef __NetBSD__
- err = -drmMap(fd, mmap_arg.offset, size, ptr);
- if (err)
-#else
ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, mmap_arg.offset);
if (ptr == MAP_FAILED)
-#endif
return NULL;
return ptr;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: snj
Date: Fri Jan 16 21:32:11 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: backlight.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c sna_display.c
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel.h
Removed Files:
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_glamor.c
intel_glamor.h uxa-glamor.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/backlight.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_glamor.c \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_glamor.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/uxa-glamor.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/backlight.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.2 Wed Nov 5 17:58:59 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/backlight.c Fri Jan 16 21:32:11 2015
@@ -81,6 +81,7 @@ void backlight_init(struct backlight *b)
b-fd = -1;
b-pid = -1;
b-max = -1;
+ b-has_power = 0;
}
#if defined(__OpenBSD__) || defined(__NetBSD__)
@@ -153,6 +154,15 @@ enum backlight_type backlight_exists(con
return BL_PLATFORM;
}
+int backlight_on(struct backlight *b)
+{
+ return 0;
+}
+
+int backlight_off(struct backlight *b)
+{
+ return 0;
+}
#else
static int
@@ -202,6 +212,21 @@ __backlight_read(const char *iface, cons
return val;
}
+static int
+__backlight_write(const char *iface, const char *file, const char *value)
+{
+ int fd, ret;
+
+ fd = __backlight_open(iface, file, O_WRONLY);
+ if (fd 0)
+ return -1;
+
+ ret = write(fd, value, strlen(value)+1);
+ close(fd);
+
+ return ret;
+}
+
/* List of available kernel interfaces in priority order */
static const char *known_interfaces[] = {
dell_backlight,
@@ -284,6 +309,9 @@ static int __backlight_direct_init(struc
if (fd 0)
return 0;
+ if (__backlight_read(iface, bl_power) != -1)
+ b-has_power = 1;
+
return __backlight_init(b, iface, fd);
}
@@ -448,6 +476,30 @@ int backlight_get(struct backlight *b)
level = -1;
return level;
}
+
+int backlight_off(struct backlight *b)
+{
+ if (b-iface == NULL)
+ return 0;
+
+ if (!b-has_power)
+ return 0;
+
+ /* 4 - FB_BLANK_POWERDOWN */
+ return __backlight_write(b-iface, bl_power, 4);
+}
+
+int backlight_on(struct backlight *b)
+{
+ if (b-iface == NULL)
+ return 0;
+
+ if (!b-has_power)
+ return 0;
+
+ /* 0 - FB_BLANK_UNBLANK */
+ return __backlight_write(b-iface, bl_power, 0);
+}
#endif
void backlight_disable(struct backlight *b)
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.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.3 Wed Nov 5 17:58:59 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Fri Jan 16 21:32:11 2015
@@ -79,9 +79,11 @@ search_snoop_cache(struct kgem *kgem, un
#define DBG_NO_RELAXED_FENCING 0
#define DBG_NO_SECURE_BATCHES 0
#define DBG_NO_PINNED_BATCHES 0
+#define DBG_NO_SHRINK_BATCHES 0
#define DBG_NO_FAST_RELOC 0
#define DBG_NO_HANDLE_LUT 0
#define DBG_NO_WT 0
+#define DBG_NO_WC_MMAP 0
#define DBG_DUMP 0
#define DBG_NO_MALLOC_CACHE 0
@@ -94,6 +96,11 @@ search_snoop_cache(struct kgem *kgem, un
#define SHOW_BATCH_BEFORE 0
#define SHOW_BATCH_AFTER 0
+#if !USE_WC_MMAP
+#undef DBG_NO_WC_MMAP
+#define DBG_NO_WC_MMAP 1
+#endif
+
#if 0
#define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__))
#define ASSERT_MAYBE_IDLE(kgem__, handle__, expect__) assert(!(expect__) || !__kgem_busy(kgem__, handle__))
@@ -126,12 +133,14 @@ search_snoop_cache(struct kgem *kgem, un
#define LOCAL_I915_PARAM_HAS_BLT 11
#define LOCAL_I915_PARAM_HAS_RELAXED_FENCING 12
#define LOCAL_I915_PARAM_HAS_RELAXED_DELTA 15
+#define LOCAL_I915_PARAM_HAS_LLC 17
#define LOCAL_I915_PARAM_HAS_SEMAPHORES 20
#define LOCAL_I915_PARAM_HAS_SECURE_BATCHES 23
#define LOCAL_I915_PARAM_HAS_PINNED_BATCHES 24
#define LOCAL_I915_PARAM_HAS_NO_RELOC 25
#define LOCAL_I915_PARAM_HAS_HANDLE_LUT 26
#define LOCAL_I915_PARAM_HAS_WT 27
+#define LOCAL_I915_PARAM_MMAP_VERSION 30
#define LOCAL_I915_EXEC_IS_PINNED (110)
#define LOCAL_I915_EXEC_NO_RELOC (111)
@@ -178,6 +187,17 @@ struct
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc Committed By: snj Date: Fri Jan 16 21:34:49 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri2.c Log Message: apply upstream revision e143ce600af286ed9ad9d47afc22dbfbb66628dc to fix building with x servers as ancient as ours To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri2.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-intel/dist/src/sna/sna_dri2.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri2.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri2.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri2.c:1.1.1.2 Fri Jan 16 21:27:25 2015 +++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri2.c Fri Jan 16 21:34:49 2015 @@ -247,6 +247,7 @@ inline static void *dri2_window_get_fron #define xorg_can_triple_buffer() 0 #define swap_limit(d, l) false +#define mark_stale(b) #else
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: christos Date: Wed Nov 5 17:58:59 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: backlight.c xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810_dri.c xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel.h Removed Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/backlight.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c cvs rdiff -u -r1.3 -r0 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel.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/backlight.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/backlight.c:1.1.1.1 Wed Nov 5 12:56:20 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/backlight.c Wed Nov 5 12:58:59 2014 @@ -83,7 +83,7 @@ void backlight_init(struct backlight *b) b-max = -1; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include dev/wscons/wsconsio.h #include xf86Priv.h Index: xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.3 --- xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c:1.2 Wed Apr 2 22:50:29 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c Wed Nov 5 12:58:59 2014 @@ -7,6 +7,7 @@ #include string.h #include assert.h +#include xorg-server.h #include xf86.h #include xf86_OSproc.h 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.3 --- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 Wed Apr 2 23:59:19 2014 +++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Wed Nov 5 12:58:59 2014 @@ -35,7 +35,9 @@ #include unistd.h #include sys/ioctl.h #include sys/mman.h +#include sys/stat.h #include time.h +#include sched.h #include errno.h #include fcntl.h @@ -59,8 +61,10 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define DBG_NO_HW 0 +#define DBG_NO_EXEC 0 #define DBG_NO_TILING 0 #define DBG_NO_CACHE 0 +#define DBG_NO_SNOOP_CACHE 0 #define DBG_NO_CACHE_LEVEL 0 #define DBG_NO_CPU 0 #define DBG_NO_CREATE2 0 @@ -79,6 +83,7 @@ search_snoop_cache(struct kgem *kgem, un #define DBG_NO_HANDLE_LUT 0 #define DBG_NO_WT 0 #define DBG_DUMP 0 +#define DBG_NO_MALLOC_CACHE 0 #define FORCE_MMAP_SYNC 0 /* ((1 DOMAIN_CPU) | (1 DOMAIN_GTT)) */ @@ -86,7 +91,8 @@ search_snoop_cache(struct kgem *kgem, un #define DEBUG_SYNC 0 #endif -#define SHOW_BATCH 0 +#define SHOW_BATCH_BEFORE 0 +#define SHOW_BATCH_AFTER 0 #if 0 #define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__)) @@ -100,8 +106,12 @@ search_snoop_cache(struct kgem *kgem, un * is being simultaneously being read by the GPU, or within the sampler * prefetch. In general, the chipsets seem to have a requirement that sampler * offsets be aligned to a cacheline (64 bytes). + * + * Actually, it turns out the BLT color pattern (BR15) has the most severe + * alignment restrictions, 64 bytes for 8-bpp, 128 bytes for 16-bpp and 256 + * bytes for 32-bpp. */ -#define UPLOAD_ALIGNMENT 128 +#define UPLOAD_ALIGNMENT 256 #define PAGE_ALIGN(x) ALIGN(x, PAGE_SIZE) #define NUM_PAGES(x) (((x) + PAGE_SIZE-1) / PAGE_SIZE) @@ -110,12 +120,8 @@ search_snoop_cache(struct kgem *kgem, un #define MAX_CPU_VMA_CACHE INT16_MAX #define MAP_PRESERVE_TIME 10 -#define MAKE_CPU_MAP(ptr) ((void*)((uintptr_t)(ptr) | 1)) -#define MAKE_USER_MAP(ptr) ((void*)((uintptr_t)(ptr) | 3)) -#define IS_USER_MAP(ptr) ((uintptr_t)(ptr) 2) -#define __MAP_TYPE(ptr) ((uintptr_t)(ptr) 3) - -#define MAKE_REQUEST(rq, ring) ((struct kgem_request *)((uintptr_t)(rq) | (ring))) +#define MAKE_USER_MAP(ptr) ((void*)((uintptr_t)(ptr) | 1)) +#define IS_USER_MAP(ptr) ((uintptr_t)(ptr) 1) #define LOCAL_I915_PARAM_HAS_BLT 11 #define LOCAL_I915_PARAM_HAS_RELAXED_FENCING 12 @@ -131,7 +137,7 @@ search_snoop_cache(struct kgem *kgem, un #define LOCAL_I915_EXEC_NO_RELOC (111) #define LOCAL_I915_EXEC_HANDLE_LUT (112) -#define LOCAL_I915_GEM_CREATE2
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: snj
Date: Wed Nov 5 19:54:00 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_display.c
Log Message:
convert to drmMap. say hello to a visible cursor!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_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-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.2 Wed Nov 5 17:56:24 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Wed Nov 5 19:54:00 2014
@@ -438,14 +438,22 @@ static void *gem_mmap(int fd, int handle
{
struct drm_i915_gem_mmap_gtt mmap_arg;
void *ptr;
+#ifdef __NetBSD__
+ int err;
+#endif
VG_CLEAR(mmap_arg);
mmap_arg.handle = handle;
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, mmap_arg))
return NULL;
+#ifdef __NetBSD__
+ err = -drmMap(fd, mmap_arg.offset, size, ptr);
+ if (err)
+#else
ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, mmap_arg.offset);
if (ptr == MAP_FAILED)
+#endif
return NULL;
return ptr;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: riastradh
Date: Wed Jul 9 22:07:02 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c
Log Message:
Revert stop-gap in 1.2 now that Mesa is updated.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_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-intel/dist/src/sna/sna_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2 Tue Jul 1 15:16:07 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c Wed Jul 9 22:07:02 2014
@@ -2287,11 +2287,8 @@ static const char *dri_driver_name(struc
return has_i830_dri() ? i830 : i915;
else if (sna-kgem.gen 040)
return i915;
- /* XXX No Ivy Bridge yet in our version of Mesa. */
- else if (sna-kgem.gen 070)
- return i965;
else
- return NULL;
+ return i965;
}
return s;
@@ -2324,11 +2321,6 @@ bool sna_dri_open(struct sna *sna, Scree
memset(info, '\0', sizeof(info));
info.fd = sna-kgem.fd;
info.driverName = dri_driver_name(sna);
- if (info.driverName == NULL) {
- xf86DrvMsg(sna-scrn-scrnIndex, X_WARNING,
- no DRI2 on NetBSD for this device yet);
- return false;
- }
info.deviceName = intel_get_device_name(sna-scrn);
DBG((%s: loading dri driver '%s' [gen=%d] for device '%s'\n,
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: riastradh
Date: Tue Jul 1 15:16:07 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c
Log Message:
Disable DRI for Ivy Bridge (and later) until we update Mesa.
This is a stop-gap for PR 48916.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_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-intel/dist/src/sna/sna_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c:1.1.1.1 Fri Mar 21 22:42:41 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c Tue Jul 1 15:16:07 2014
@@ -2287,8 +2287,11 @@ static const char *dri_driver_name(struc
return has_i830_dri() ? i830 : i915;
else if (sna-kgem.gen 040)
return i915;
- else
+ /* XXX No Ivy Bridge yet in our version of Mesa. */
+ else if (sna-kgem.gen 070)
return i965;
+ else
+ return NULL;
}
return s;
@@ -2321,6 +2324,11 @@ bool sna_dri_open(struct sna *sna, Scree
memset(info, '\0', sizeof(info));
info.fd = sna-kgem.fd;
info.driverName = dri_driver_name(sna);
+ if (info.driverName == NULL) {
+ xf86DrvMsg(sna-scrn-scrnIndex, X_WARNING,
+ no DRI2 on NetBSD for this device yet);
+ return false;
+ }
info.deviceName = intel_get_device_name(sna-scrn);
DBG((%s: loading dri driver '%s' [gen=%d] for device '%s'\n,
CVS commit: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: riastradh Date: Thu Apr 3 02:50:30 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810_dri.c Removed Files: xsrc/external/mit/xf86-video-intel/dist: acinclude.m4 xsrc/external/mit/xf86-video-intel/dist/src: brw_defines.h brw_structs.h common.h drmmode_display.c exa_sf.g4a exa_sf.g4b exa_sf_mask.g4a exa_sf_mask.g4b exa_wm.g4i exa_wm_affine.g4i exa_wm_ca.g4a exa_wm_ca.g4b exa_wm_ca_srcalpha.g4a exa_wm_ca_srcalpha.g4b exa_wm_mask_affine.g4a exa_wm_mask_affine.g4b exa_wm_mask_projective.g4a exa_wm_mask_projective.g4b exa_wm_mask_sample_a.g4a exa_wm_mask_sample_a.g4b exa_wm_mask_sample_argb.g4a exa_wm_mask_sample_argb.g4b exa_wm_noca.g4a exa_wm_noca.g4b exa_wm_projective.g4i exa_wm_src_affine.g4a exa_wm_src_affine.g4b exa_wm_src_projective.g4a exa_wm_src_projective.g4b exa_wm_src_sample_a.g4a exa_wm_src_sample_a.g4b exa_wm_src_sample_argb.g4a exa_wm_src_sample_argb.g4b exa_wm_src_sample_planar.g4a exa_wm_src_sample_planar.g4b exa_wm_write.g4a exa_wm_write.g4b exa_wm_xy.g4a exa_wm_xy.g4b exa_wm_yuv_rgb.g4a exa_wm_yuv_rgb.g4b i2c_vid.h i810.h i810_accel.c i810_common.h i810_cursor.c i810_dga.c i810_dri.c i810_dri.h i810_driver.c i810_hwmc.c i810_io.c i810_memory.c i810_reg.h i810_ring.h i810_video.c i810_wmark.c i830.h i830_3d.c i830_accel.c i830_batchbuffer.c i830_batchbuffer.h i830_bios.c i830_bios.h i830_common.h i830_crt.c i830_cursor.c i830_debug.c i830_debug.h i830_display.c i830_display.h i830_dri.c i830_dri.h i830_driver.c i830_dvo.c i830_exa.c i830_hdmi.c i830_hwmc.c i830_hwmc.h i830_i2c.c i830_io.c i830_lvds.c i830_memory.c i830_modes.c i830_quirks.c i830_reg.h i830_render.c i830_ring.h i830_sdvo.c i830_sdvo.h i830_sdvo_regs.h i830_tv.c i830_video.c i830_video.h i830_xaa.c i915_3d.c i915_3d.h i915_hwmc.c i915_hwmc.h i915_reg.h i915_render.c i915_video.c i965_hwmc.c i965_hwmc.h i965_render.c i965_video.c local_xf86Rename.h packed_yuv_sf.g4a packed_yuv_sf.g4b packed_yuv_wm.g4a packed_yuv_wm.g4b xsrc/external/mit/xf86-video-intel/dist/src/bios_reader: Makefile.am Makefile.in bios_dumper.c bios_reader.c swf_dumper.c xsrc/external/mit/xf86-video-intel/dist/src/ch7017: Makefile.am Makefile.in ch7017.c ch7017_module.c ch7017_reg.h xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx: Makefile.am Makefile.in ch7xxx.c ch7xxx.h ch7xxx_module.c ch7xxx_reg.h xsrc/external/mit/xf86-video-intel/dist/src/ivch: Makefile.am Makefile.in ivch.c ivch_module.c ivch_reg.h xsrc/external/mit/xf86-video-intel/dist/src/modes: xf86Crtc.c xf86Crtc.h xf86Cursors.c xf86DiDGA.c xf86EdidModes.c xf86Modes.c xf86Modes.h xf86RandR12.c xf86RandR12.h xf86Rename.h xf86Rotate.c xf86cvt.c xsrc/external/mit/xf86-video-intel/dist/src/parser: xf86Optrec.h xf86Parser.h xsrc/external/mit/xf86-video-intel/dist/src/reg_dumper: Makefile.am Makefile.in gtt.c hotplug.c idle.c main.c reg_dumper.h statuspage.c stepping.c util.c xprintf.c xsrc/external/mit/xf86-video-intel/dist/src/sil164: Makefile.am Makefile.in sil164.c sil164.h sil164_module.c sil164_reg.h xsrc/external/mit/xf86-video-intel/dist/src/tfp410: Makefile.am Makefile.in tfp410.c tfp410.h tfp410_module.c tfp410_reg.h xsrc/external/mit/xf86-video-intel/dist/src/xvmc: I810XvMC.c I810XvMC.h Makefile.am Makefile.in addidct.g4i block_clear.g4i dual_prime.g4a dual_prime.g4b dual_prime_igd.g4a dual_prime_igd.g4b field_backward.g4a field_backward.g4b field_backward_igd.g4a field_backward_igd.g4b field_f_b.g4a field_f_b.g4b field_f_b_igd.g4a field_f_b_igd.g4b field_forward.g4a field_forward.g4b field_forward_igd.g4a field_forward_igd.g4b frame_backward.g4a frame_backward.g4b frame_backward_igd.g4a frame_backward_igd.g4b frame_f_b.g4a frame_f_b.g4b frame_f_b_igd.g4a frame_f_b_igd.g4b frame_forward.g4a frame_forward.g4b frame_forward_igd.g4a frame_forward_igd.g4b i915_program.h i915_structs.h i915_xvmc.c i915_xvmc.h i965_xvmc.c i965_xvmc.h intel_batchbuffer.c intel_batchbuffer.h intel_xvmc.c intel_xvmc.h intel_xvmc_dump.c ipicture.g4a ipicture.g4b motion_field_uv.g4i motion_field_y.g4i motion_frame_uv.g4i motion_frame_y.g4i null.g4a null.g4b read_field_x0y0_uv.g4i read_field_x0y0_uv_igd.g4i read_field_x0y0_y.g4i read_field_x0y0_y_igd.g4i
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: riastradh
Date: Thu Apr 3 03:59:19 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c
Log Message:
Use drmMap rather than mmap directly, to invoke the ioctl on NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.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-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.1.1.1 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.1.1.1 Fri Mar 21 22:42:41 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Thu Apr 3 03:59:19 2014
@@ -322,6 +322,7 @@ static void *__kgem_bo_map__gtt(struct k
{
struct drm_i915_gem_mmap_gtt mmap_arg;
void *ptr;
+ int err;
DBG((%s(handle=%d, size=%d)\n, __FUNCTION__,
bo-handle, bytes(bo)));
@@ -333,7 +334,7 @@ retry_gtt:
VG_CLEAR(mmap_arg);
mmap_arg.handle = bo-handle;
if (drmIoctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP_GTT, mmap_arg)) {
- int err = errno;
+ err = errno;
assert(err != EINVAL);
@@ -352,11 +353,8 @@ retry_gtt:
}
retry_mmap:
- ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
- kgem-fd, mmap_arg.offset);
- if (ptr == MAP_FAILED) {
- int err = errno;
-
+ err = -drmMap(kgem-fd, mmap_arg.offset, bytes(bo), ptr);
+ if (err) {
assert(err != EINVAL);
if (__kgem_throttle_retire(kgem, 0))
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: christos Date: Wed Nov 13 21:48:25 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i810_dri.c Log Message: CID 1107544: Fix memory leak To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/i810_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-intel/dist/src/i810_dri.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.3 --- xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.2 Thu Oct 17 02:40:02 2013 +++ xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c Wed Nov 13 16:48:25 2013 @@ -272,6 +272,7 @@ I810InitVisualConfigs(ScreenPtr pScreen) pI810-pVisualConfigs = pConfigs; pI810-pVisualConfigsPriv = pI810Configs; GlxSetVisualConfigs(numConfigs, pConfigs, (void **)pI810ConfigPtrs); + xfree(pI810ConfigPtrs); return TRUE; }
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: christos
Date: Thu Nov 14 00:11:12 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i810_dri.c
Log Message:
CID 1107540: Make the code safe avoiding random stack access. In the first
loop where there is a singleton point to pptSrc, only access that singleton,
no matter what.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/i810_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-intel/dist/src/i810_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.3 Wed Nov 13 16:48:25 2013
+++ xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c Wed Nov 13 19:11:12 2013
@@ -1245,10 +1245,17 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
while ((pboxNext = pbox) (pboxBase-y1 == pboxNext-y1))
pboxNext--;
pboxTmp = pboxNext + 1;
- pptTmp = pptSrc + (pboxTmp - pbox);
- while (pboxTmp = pboxBase) {
- *pboxNew1++ = *pboxTmp++;
- *pptNew1++ = *pptTmp++;
+ if (pptSrc == ptOldOrg) {
+ if (pboxTmp = pboxBase) {
+ *pboxNew1++ = *pboxTmp;
+ *pptNew1++ = *pptSrc;
+ }
+ } else {
+ pptTmp = pptSrc + (pboxTmp - pbox);
+ while (pboxTmp = pboxBase) {
+ *pboxNew1++ = *pboxTmp++;
+ *pptNew1++ = *pptTmp++;
+ }
}
pboxBase = pboxNext;
}
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: martin Date: Thu Oct 17 06:40:02 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i810_dri.c Log Message: Fix memset size argument, found by coverity. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/i810_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-intel/dist/src/i810_dri.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c:1.1.1.1 Sat Aug 2 05:12:40 2008 +++ xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.c Thu Oct 17 06:40:02 2013 @@ -1117,7 +1117,7 @@ I810DRIFinishScreenInit(ScreenPtr pScree ScrnInfoPtrpScrn = xf86Screens[pScreen-myNum]; I810Ptr info = I810PTR(pScrn); - memset(sPriv, 0, sizeof(sPriv)); + memset(sPriv, 0, sizeof(*sPriv)); /* Have shadow run only while there is 3d active. */
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: tsutsui Date: Fri Jun 8 14:19:15 UTC 2012 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i830.h Log Message: Make xf86-video-intel driver work on Atom N455 + GMA3150 graphics chipset by pulling the following change from upstream: http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/src/i830.h?id=8f64837e56b2de0fb8a9100d1a844fd3f18d751c Disable FBC on IGD for UMS It appears the new chip doesn't support FBC currently. Tested on MSI U135DX + NetBSD/i386 6.0_BETA2 with this patch. Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-intel/dist/src/i830.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/i830.h diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830.h:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830.h:1.3 --- xsrc/external/mit/xf86-video-intel/dist/src/i830.h:1.2 Sun May 15 23:03:21 2011 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830.h Fri Jun 8 14:19:14 2012 @@ -972,6 +972,8 @@ static inline int i830_fb_compression_su return FALSE; if (IS_I810(pI830) || IS_I815(pI830) || IS_I830(pI830)) return FALSE; +if (IS_IGD(pI830)) + return FALSE; /* fbc depends on tiled surface. And we don't support tiled * front buffer with XAA now. */
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Wed Jun 6 15:19:54 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_render.c
Log Message:
Pull the similar fix from i915_render.c rev 1.2 and i965_render.c rev 1.2:
http://mail-index.NetBSD.org/source-changes/2010/12/27/msg016345.html
XXX: Fix crash with Firefox, where drawable is NULL.
There must be a better fix for this.
http://mail-index.NetBSD.org/source-changes/2011/01/21/msg017560.html
Avoid a crash when pDrawable is null.
Fixes Xserver SEGV on starting Firefox on old i830/855GM machines
running 6.0_BETA2.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_render.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-intel/dist/src/i830_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c Wed Jun 6 15:19:54 2012
@@ -212,6 +212,8 @@ static uint32_t i830_get_blend_cntl(int
static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
{
+if (pPict-pDrawable == NULL)
+ return FALSE;
ScrnInfoPtr pScrn = xf86Screens[pPict-pDrawable-pScreen-myNum];
int w = pPict-pDrawable-width;
int h = pPict-pDrawable-height;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: jmcneill
Date: Mon Nov 14 11:26:52 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_quirks.c
Log Message:
Use sysctl machdep.dmi.* instead of /sys/class/dmi/id/* for extracting DMI info
on NetBSD
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.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-intel/dist/src/i830_quirks.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_quirks.c Mon Nov 14 11:26:52 2011
@@ -32,8 +32,14 @@
#define SUBSYS_ANY (~0)
+#ifdef __NetBSD__
+#include sys/param.h
+#include sys/sysctl.h
+#define DMIID_SYSCTL_PREFIX machdep.dmi.
+#else
#define DMIID_DIR /sys/class/dmi/id/
#define DMIID_FILE(x) (DMIID_DIR # x)
+#endif
typedef struct {
int chipType;
@@ -66,6 +72,62 @@ enum i830_dmi_data_t {
static char *i830_dmi_data[dmi_data_max];
+#ifdef __NetBSD__
+/* NetBSD 6.0+ stores DMI data in sysctl machdep.dmi.* */
+static void
+i830_dmi_sysctl_load(enum i830_dmi_data_t field)
+{
+ const char *name;
+ char *buf;
+ size_t buflen = 0;
+ int err;
+
+ switch (field) {
+ case bios_vendor: name = DMIID_SYSCTL_PREFIX bios-vendor; break;
+ case bios_version: name = DMIID_SYSCTL_PREFIX bios-version; break;
+ case bios_date: name = DMIID_SYSCTL_PREFIX bios-date; break;
+ case sys_vendor: name = DMIID_SYSCTL_PREFIX system-vendor; break;
+ case product_name: name = DMIID_SYSCTL_PREFIX system-product; break;
+ case product_version: name = DMIID_SYSCTL_PREFIX system-version; break;
+ case product_serial: name = DMIID_SYSCTL_PREFIX system-serial; break;
+ case product_uuid: name = DMIID_SYSCTL_PREFIX system-uuid; break;
+ case board_vendor: name = DMIID_SYSCTL_PREFIX board-vendor; break;
+ case board_name: name = DMIID_SYSCTL_PREFIX board-product; break;
+ case board_version: name = DMIID_SYSCTL_PREFIX board-version; break;
+ case board_serial: name = DMIID_SYSCTL_PREFIX board-serial; break;
+ default: goto not_found;
+ }
+
+ err = sysctlbyname(name, buf, buflen, NULL, 0);
+ if (err || buflen == 0)
+ goto not_found;
+
+ buf = xcalloc(1, buflen);
+ if (buf == NULL)
+ goto not_found;
+
+ err = sysctlbyname(name, buf, buflen, NULL, 0);
+ if (err)
+ goto not_found;
+
+ /* i830_dmi_scan uses a fixed-size buffer, use our own instead */
+ xfree(i830_dmi_data[field]);
+ i830_dmi_data[field] = buf;
+
+ return;
+
+not_found:
+ xfree(i830_dmi_data[field]);
+ i830_dmi_data[field] = NULL;
+}
+
+#define I830_DMI_FIELD_FUNC(field) \
+static void i830_dmi_store_##field(void) \
+{\
+i830_dmi_sysctl_load(field);\
+}
+#else
+/* Linux stores DMI data in /sys/class/dmi/id/... */
#define I830_DMI_FIELD_FUNC(field) \
static void i830_dmi_store_##field(void) \
{\
@@ -78,6 +140,7 @@ static void i830_dmi_store_##field(void)
fread(i830_dmi_data[field], 64, 1, f);\
fclose(f);\
}
+#endif
I830_DMI_FIELD_FUNC(bios_vendor);
I830_DMI_FIELD_FUNC(bios_version);
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 23:15:03 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i830_lvds.c Log Message: Fix memset usage. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/i830_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-intel/dist/src/i830_lvds.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.1.1.2 Tue Jun 9 02:54:33 2009 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c Thu Aug 11 23:15:03 2011 @@ -430,7 +430,7 @@ } } state_name = malloc(strlen(ACPI_LID) + strlen(lid_dent-d_name) + 7); -memset(state_name, 0, sizeof(state_name)); +memset(state_name, 0, sizeof(*state_name)); strcat(state_name, ACPI_LID); strcat(state_name, lid_dent-d_name); strcat(state_name, /state);
CVS commit: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc
Committed By: jmcneill
Date: Sat Feb 12 00:07:27 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_exa.c
xsrc/external/mit/xf86-video-intel/dist/uxa: uxa-priv.h uxa.c
Log Message:
In case somebody wants to try to get UXA working, make it compile against
newer X servers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.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-intel/dist/src/i830_exa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c Sat Feb 12 00:07:26 2011
@@ -83,7 +83,7 @@
};
#ifdef I830_USE_UXA
-static int uxa_pixmap_index;
+static DevPrivateKeyRec uxa_pixmap_index;
#endif
#ifndef SERVER_1_5
@@ -1035,7 +1035,7 @@
I830Ptr i830 = I830PTR(scrn);
#ifdef SERVER_1_5
-if (!dixRequestPrivate(uxa_pixmap_index, 0))
+if (!dixRegisterPrivateKey(uxa_pixmap_index, PRIVATE_PIXMAP, 0))
return FALSE;
#else
if (!AllocatePixmapPrivate(pScreen, uxa_pixmap_index, 0))
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h Sat Feb 12 00:07:26 2011
@@ -43,7 +43,36 @@
#include X11/Xproto.h
#ifdef MITSHM
#define _XSHM_SERVER_
-#include X11/extensions/shmstr.h
+/* X11/extensions/shmstr.h */
+/* #warning this file is deprecated and provided only for source compatibility */
+#include X11/extensions/shmproto.h
+
+#define XSHM_PUT_IMAGE_ARGS \
+DrawablePtr /* dst */, \
+GCPtr /* pGC */, \
+int /* depth */, \
+unsigned int /* format */, \
+int /* w */, \
+int /* h */, \
+int /* sx */, \
+int /* sy */, \
+int /* sw */, \
+int /* sh */, \
+int /* dx */, \
+int /* dy */, \
+char * /* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+ScreenPtr /* pScreen */, \
+int /* width */, \
+int /* height */, \
+int /* depth */, \
+char * /* addr */
+
+typedef struct _ShmFuncs {
+PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
#endif
#include scrnintstr.h
#include pixmapstr.h
@@ -167,7 +196,7 @@
(PixmapWidthPaddingInfo[d].padRoundUp+1)))
#endif
-extern int uxa_screen_index;
+extern DevPrivateKeyRec uxa_screen_index;
static inline uxa_screen_t *
uxa_get_screen(ScreenPtr screen)
{
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c Sat Feb 12 00:07:26 2011
@@ -39,7 +39,7 @@
#include dixfontstr.h
#include uxa.h
-int uxa_screen_index;
+DevPrivateKeyRec uxa_screen_index;
#ifndef SERVER_1_5
static int uxa_generation;
#endif
@@ -479,6 +479,7 @@
uxa_screen-info = uxa_driver;
#ifdef SERVER_1_5
+dixRegisterPrivateKey(uxa_screen_index, PRIVATE_SCREEN, 0);
dixSetPrivate(screen-devPrivates, uxa_screen_index, uxa_screen);
#else
if (uxa_generation != serverGeneration) {
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: ahoka
Date: Sat Jan 22 18:57:36 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_bios.c
Log Message:
add an ifndef __linux__ requested by mrg
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.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-intel/dist/src/i830_bios.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.2 Fri Jan 21 09:48:29 2011
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c Sat Jan 22 18:57:36 2011
@@ -238,7 +238,12 @@
if (ret != 0) {
xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
libpciaccess failed to read %dkB video BIOS: %s\n,
- size / 1024, strerror(ret));
+ size / 1024,
+#ifndef __linux__
+ strerror(ret));
+#else
+ strerror(-ret));
+#endif
xfree (bios);
return -1;
}
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/xvmc
Module Name:xsrc
Committed By: christos
Date: Sat Jan 22 21:15:16 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/xvmc: intel_xvmc.c
intel_xvmc.h
Log Message:
stop screaming: s/DEBUG/debug/g
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c \
xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.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/xvmc/intel_xvmc.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c:1.1.1.2 Mon Jun 8 22:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.c Sat Jan 22 16:15:16 2011
@@ -98,7 +98,7 @@
768 /* 11 */
};
-int DEBUG;
+int debug;
static int error_base;
static int event_base;
@@ -106,7 +106,7 @@
static void intel_xvmc_debug_init(void)
{
if (getenv(INTEL_XVMC_DEBUG))
- DEBUG = 1;
+ debug = 1;
}
/* locking */
Index: xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h:1.1.1.2 Mon Jun 8 22:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/xvmc/intel_xvmc.h Sat Jan 22 16:15:16 2011
@@ -57,7 +57,7 @@
#include intel_batchbuffer.h
-extern int DEBUG;
+extern int debug;
#define XVMC_ERR(s, arg...) \
do { \
@@ -71,7 +71,7 @@
#define XVMC_DBG(s, arg...) \
do {\
- if (DEBUG) \
+ if (debug) \
fprintf(stderr, [intel_xvmc] debug: s \n, ##arg); \
} while (0)
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: ahoka
Date: Fri Jan 21 09:46:19 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i915_render.c
Log Message:
Avoid a crash when pDrawable is null.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i915_render.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-intel/dist/src/i915_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c Fri Jan 21 09:46:19 2011
@@ -169,6 +169,9 @@
static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
{
+if (pPict-pDrawable == NULL)
+ return FALSE;
+
ScrnInfoPtr pScrn = xf86Screens[pPict-pDrawable-pScreen-myNum];
int w = pPict-pDrawable-width;
int h = pPict-pDrawable-height;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: ahoka
Date: Fri Jan 21 09:48:29 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_bios.c
Log Message:
dont negate error value passed to strerror
the linux libpciaccess returns negated value, but no other os does...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.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-intel/dist/src/i830_bios.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_bios.c Fri Jan 21 09:48:29 2011
@@ -238,7 +238,7 @@
if (ret != 0) {
xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
libpciaccess failed to read %dkB video BIOS: %s\n,
- size / 1024, strerror(-ret));
+ size / 1024, strerror(ret));
xfree (bios);
return -1;
}
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/xvmc
Module Name:xsrc
Committed By: jmcneill
Date: Tue Jan 18 23:31:47 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/xvmc: i965_xvmc.c
Log Message:
workaround a lint bug
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.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-intel/dist/src/xvmc/i965_xvmc.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c:1.1.1.1 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/xvmc/i965_xvmc.c Tue Jan 18 23:31:47 2011
@@ -191,9 +191,9 @@
/* urb fence must be aligned to cacheline */
static void align_urb_fence()
{
-BATCH_LOCALS;
int i, offset_to_next_cacheline;
unsigned long batch_offset;
+BATCH_LOCALS;
BEGIN_BATCH(3);
batch_offset = (void *)batch_ptr - xvmc_driver-alloc.ptr;
offset_to_next_cacheline = ALIGN(batch_offset, 64) - batch_offset;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: christos
Date: Sun Jan 9 20:25:46 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_display.c
Log Message:
Revert previous hack and fix this properly. We need dpms to be turned on
to be able to load the colormap, since dpms off turns off the channel.
Guard against the lut being loaded with dpms off, and move the call to
load the lut after the dmps on one.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_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-intel/dist/src/i830_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.2 Sun Jan 9 00:36:58 2011
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c Sun Jan 9 15:25:46 2011
@@ -1170,11 +1170,11 @@
OUTREG(dspbase_reg, INREG(dspbase_reg));
}
-i830_crtc_load_lut(crtc);
-
/* Give the overlay scaler a chance to enable if it's on this pipe */
i830_crtc_dpms_video(crtc, TRUE);
+i830_crtc_load_lut(crtc);
+
/* Reenable compression if needed */
if (i830_use_fb_compression(crtc))
i830_enable_fb_compression(crtc);
@@ -1936,16 +1936,15 @@
int i;
/* The clocks have to be on to load the palette. */
-if (!crtc-enabled)
+if (!crtc-enabled || intel_crtc-dpms_mode != DPMSModeOn)
return;
-#if 0
+
for (i = 0; i 256; i++) {
OUTREG(palreg + 4 * i,
(intel_crtc-lut_r[i] 16) |
(intel_crtc-lut_g[i] 8) |
intel_crtc-lut_b[i]);
}
-#endif
}
/** Sets the color ramps on behalf of RandR */
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: christos
Date: Sun Jan 9 05:36:59 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_display.c
Log Message:
Disable loading the lut that crashes the system for now. Unfortunately this
causes butt ugly X, but at least we have X again. Wee!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_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-intel/dist/src/i830_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c:1.1.1.2 Mon Jun 8 22:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c Sun Jan 9 00:36:58 2011
@@ -1938,13 +1938,14 @@
/* The clocks have to be on to load the palette. */
if (!crtc-enabled)
return;
-
+#if 0
for (i = 0; i 256; i++) {
OUTREG(palreg + 4 * i,
(intel_crtc-lut_r[i] 16) |
(intel_crtc-lut_g[i] 8) |
intel_crtc-lut_b[i]);
}
+#endif
}
/** Sets the color ramps on behalf of RandR */
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: christos
Date: Mon Dec 27 15:40:21 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i965_render.c
Log Message:
XXX: Fix crash with Firefox, where drawable is NULL.
There must be a better fix for this.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i965_render.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-intel/dist/src/i965_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 Mon Jun 8 22:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c Mon Dec 27 10:40:21 2010
@@ -183,6 +183,8 @@
static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
{
+if (pPict-pDrawable == NULL)
+ return FALSE;
ScrnInfoPtr pScrn = xf86Screens[pPict-pDrawable-pScreen-myNum];
int w = pPict-pDrawable-width;
int h = pPict-pDrawable-height;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 29 01:42:39 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_driver.c i830_dvo.c
Log Message:
apply the hack to avoid xf86LoaderReqSymLists() and LoaderRefSymLists().
should fix PR#44167.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.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-intel/dist/src/i830_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3 Tue Nov 23 09:01:19 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c Mon Nov 29 01:42:38 2010
@@ -214,6 +214,11 @@
#include xf86drmMode.h
#endif
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#else
+
#ifdef I830_USE_EXA
const char *I830exaSymbols[] = {
exaGetVersion,
@@ -225,6 +230,7 @@
NULL
};
#endif
+#endif
#define BIT(x) (1 (x))
#define MAX(a,b) ((a) (b) ? (a) : (b))
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c Mon Nov 29 01:42:38 2010
@@ -38,6 +38,11 @@
#include ch7xxx/ch7xxx.h
#include tfp410/tfp410.h
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
static const char *SIL164Symbols[] = {
Sil164VidOutput,
NULL
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: mrg Date: Tue Nov 23 08:53:05 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i810_driver.c i810_hwmc.c i810_video.c i830_driver.c i830_i2c.c i830_video.c i915_hwmc.c xsrc/external/mit/xf86-video-intel/dist/src/ch7017: ch7017.c xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx: ch7xxx.c xsrc/external/mit/xf86-video-intel/dist/src/ivch: ivch.c xsrc/external/mit/xf86-video-intel/dist/src/sil164: sil164.c xsrc/external/mit/xf86-video-intel/dist/src/tfp410: tfp410.c Log Message: remove includes for xf86RAC.h and xf86Resources.h, they don't exist anymore. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c \ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c \ xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c \ xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c \ xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c \ xsrc/external/mit/xf86-video-intel/dist/src/i915_hwmc.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/ch7017/ch7017.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/ch7xxx/ch7xxx.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/ivch/ivch.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/sil164/sil164.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/tfp410/tfp410.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-intel/dist/src/i810_driver.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.1.1.2 Tue Jun 9 02:54:32 2009 +++ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c Tue Nov 23 08:53:04 2010 @@ -69,8 +69,6 @@ */ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h -#include xf86RAC.h #include xf86cmap.h #include compiler.h #include mibstore.h Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.1.1.2 Tue Jun 9 02:54:33 2009 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c Tue Nov 23 08:53:04 2010 @@ -175,8 +175,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h -#include xf86RAC.h #include xf86Priv.h #include xf86cmap.h #include compiler.h Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.1.1.2 Tue Jun 9 02:54:33 2009 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c Tue Nov 23 08:53:04 2010 @@ -57,7 +57,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h #include compiler.h #include xf86PciInfo.h #include xf86Pci.h Index: xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c:1.1.1.1 Sat Aug 2 05:12:44 2008 +++ xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c Tue Nov 23 08:53:04 2010 @@ -42,7 +42,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h #include compiler.h #include xf86PciInfo.h #include xf86Pci.h Index: xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c:1.1.1.1 Sat Aug 2 05:12:37 2008 +++ xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c Tue Nov 23 08:53:04 2010 @@ -42,7 +42,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h #include compiler.h #include xf86PciInfo.h #include xf86Pci.h Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c:1.1.1.1 Sat Aug 2 05:12:44 2008 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c Tue Nov 23 08:53:04 2010 @@ -31,8 +31,6 @@ #include xf86.h #include xf86_OSproc.h -#include xf86Resources.h -#include xf86RAC.h
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: mrg
Date: Tue Nov 23 09:01:19 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i810_driver.c i830_dri.c
i830_driver.c i830_video.c
Log Message:
#if 0 the code that tries to:
- call xf86RegisterResources()
- use ResUnusedOpr, ResDisableOpr or ResNone
- use racMemFlags member of ScrnInfoPtr{}
- set/use CreateBuffers/DestroyBuffers members of DRI2InfoRec{}
- one of the two calls to i830_fill_colorkey().
for the other call to i830_fill_colorkey(), update it based upon code
seen in xf86-video-intel 2.11.0, and use xf86XVFillKeyHelperDrawable().
i can't see how to get a DrawablePtr for the other call, though.
XXX: i'm entirely unsure this will work with xorg-server 1.9.2. there's
XXX: a decent chance that everything but i830-based will work, and that
XXX: even i830 will work ok, but it really needs to be tested.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c \
xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c \
xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_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-intel/dist/src/i810_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c Tue Nov 23 09:01:18 2010
@@ -876,9 +876,11 @@
pI810-PciInfo-func);
#endif
+#if 0
if (xf86RegisterResources(pI810-pEnt-index, NULL, ResNone))
return FALSE;
pScrn-racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
/* Set pScrn-monitor */
pScrn-monitor = pScrn-confScreen-monitor;
@@ -1318,8 +1320,10 @@
/* We won't be using the VGA access after the probe */
I810SetMMIOAccess(pI810);
+#if 0
xf86SetOperatingState(resVgaIo, pI810-pEnt-index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pI810-pEnt-index, ResDisableOpr);
+#endif
return TRUE;
}
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c Tue Nov 23 09:01:19 2010
@@ -1852,12 +1852,14 @@
pI830-PciInfo-func);
#endif
+#if 0
if (xf86RegisterResources(pI830-pEnt-index, NULL, ResNone)) {
PreInitCleanup(pScrn);
return FALSE;
}
pScrn-racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
pScrn-monitor = pScrn-confScreen-monitor;
pScrn-progClock = TRUE;
pScrn-rgbBits = 8;
@@ -1986,8 +1988,10 @@
/* We won't be using the VGA access after the probe. */
I830SetMMIOAccess(pI830);
+#if 0
xf86SetOperatingState(resVgaIo, pI830-pEnt-index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pI830-pEnt-index, ResDisableOpr);
+#endif
}
#if defined(XF86DRI)
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c Tue Nov 23 09:01:19 2010
@@ -2161,6 +2161,7 @@
return ret;
}
+#if 0
static void
i830_fill_colorkey (ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
{
@@ -2194,6 +2195,7 @@
xfree (rects);
FreeScratchGC (gc);
}
+#endif
/*
* The source rectangle of the video is defined by (src_x, src_y, src_w, src_h).
@@ -2505,7 +2507,13 @@
/* update cliplist */
if (!REGION_EQUAL(pScrn-pScreen, pPriv-clip, clipBoxes)) {
REGION_COPY(pScrn-pScreen, pPriv-clip, clipBoxes);
+#if 0
i830_fill_colorkey (pScreen, pPriv-colorKey, clipBoxes);
+#else
+xf86XVFillKeyHelperDrawable(pDraw,
+ pPriv-colorKey,
+ clipBoxes);
+#endif
}
} else {
Bool sync = TRUE;
@@ -2864,7 +2872,15 @@
surface-pitches[0], x1, y1, x2, y2, dstBox,
src_w, src_h, drw_w, drw_h);
+#if 0
+#if 0
i830_fill_colorkey (pScreen, pI830Priv-colorKey, clipBoxes);
+#else
+xf86XVFillKeyHelperDrawable(drawable,
+pI830Priv-colorKey,
+clipBoxes);
+#endif
+#endif
pPriv-isOn = TRUE;
/* we've prempted the XvImage stream so set its free timer */
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c:1.1.1.2
CVS commit: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 9 02:54:38 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-intel/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1310 Log Message: initial import of xf86-video-intel-2.7.1 Status: Vendor Tag: xorg Release Tags: xf86-video-intel-2-7-1 N xsrc/external/mit/xf86-video-intel/dist/AUTHORS U xsrc/external/mit/xf86-video-intel/dist/configure.ac U xsrc/external/mit/xf86-video-intel/dist/config.guess U xsrc/external/mit/xf86-video-intel/dist/configure U xsrc/external/mit/xf86-video-intel/dist/COPYING U xsrc/external/mit/xf86-video-intel/dist/config.sub U xsrc/external/mit/xf86-video-intel/dist/aclocal.m4 U xsrc/external/mit/xf86-video-intel/dist/acinclude.m4 U xsrc/external/mit/xf86-video-intel/dist/install-sh U xsrc/external/mit/xf86-video-intel/dist/compile U xsrc/external/mit/xf86-video-intel/dist/Makefile.in U xsrc/external/mit/xf86-video-intel/dist/depcomp U xsrc/external/mit/xf86-video-intel/dist/README U xsrc/external/mit/xf86-video-intel/dist/config.h.in N xsrc/external/mit/xf86-video-intel/dist/NEWS U xsrc/external/mit/xf86-video-intel/dist/missing U xsrc/external/mit/xf86-video-intel/dist/Makefile.am U xsrc/external/mit/xf86-video-intel/dist/ltmain.sh U xsrc/external/mit/xf86-video-intel/dist/man/intel.man U xsrc/external/mit/xf86-video-intel/dist/man/Makefile.in U xsrc/external/mit/xf86-video-intel/dist/man/Makefile.am N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-unaccel.c N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-accel.c N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h N xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.in N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-render.c N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.h N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-glyphs.c N xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c N xsrc/external/mit/xf86-video-intel/dist/uxa/Makefile.am U xsrc/external/mit/xf86-video-intel/dist/src/packed_yuv_sf.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i810_dga.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_src_sample_planar.g4b U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_ca_srcalpha.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i810_video.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_debug.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_write.g4a U xsrc/external/mit/xf86-video-intel/dist/src/i830_crt.c U xsrc/external/mit/xf86-video-intel/dist/src/i810_common.h U xsrc/external/mit/xf86-video-intel/dist/src/i830_tv.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_mask_projective.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.h U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_mask_sample_argb.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c U xsrc/external/mit/xf86-video-intel/dist/src/i915_3d.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_write.g4b U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_xy.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i830.h U xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c U xsrc/external/mit/xf86-video-intel/dist/src/i810_hwmc.c U xsrc/external/mit/xf86-video-intel/dist/src/i2c_vid.h U xsrc/external/mit/xf86-video-intel/dist/src/i915_reg.h U xsrc/external/mit/xf86-video-intel/dist/src/packed_yuv_wm.g4a U xsrc/external/mit/xf86-video-intel/dist/src/i810_memory.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_i2c.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_accel.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_mask_projective.g4a U xsrc/external/mit/xf86-video-intel/dist/src/packed_yuv_wm.g4b U xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_mask_affine.g4a U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_yuv_rgb.g4a U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_src_sample_a.g4a U xsrc/external/mit/xf86-video-intel/dist/src/i915_video.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_memory.c U xsrc/external/mit/xf86-video-intel/dist/src/i810.h U xsrc/external/mit/xf86-video-intel/dist/src/packed_yuv_sf.g4a U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_mask_sample_argb.g4a U xsrc/external/mit/xf86-video-intel/dist/src/i810_dri.h N xsrc/external/mit/xf86-video-intel/dist/src/i830_batchbuffer.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_display.h U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_src_sample_argb.g4b U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_src_affine.g4a U xsrc/external/mit/xf86-video-intel/dist/src/i830_hdmi.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_ring.h U xsrc/external/mit/xf86-video-intel/dist/src/i810_io.c U xsrc/external/mit/xf86-video-intel/dist/src/i830_modes.c U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm.g4i U xsrc/external/mit/xf86-video-intel/dist/src/exa_wm_affine.g4i U
