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;
