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/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/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/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))
