CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist/src/sna

[Soren Jacobsen]

Module Name:    xsrc
Committed By:   snj
Date:           Tue May 19 05:35:49 UTC 2015

Modified Files:
        xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
            sna_display.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #788):
        external/mit/xf86-video-intel/dist/src/sna/kgem.c: revision 1.5
        external/mit/xf86-video-intel/dist/src/sna/sna_display.c: revision 1.4
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.2.2.2 -r1.2.2.3 \
    xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.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/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.2	Wed Jan 21 11:23:13 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c	Tue May 19 05:35:48 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.1.1.1.2.1 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.1.2.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.1.2.1	Wed Jan 21 11:23:13 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c	Tue May 19 05:35:49 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;