Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:33:34 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c i915_gem_gtt.c
Log Message:
#ifdef custodial service
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.37 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.38
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.37 Mon Aug 27 06:07:58 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Mon Aug 27 06:33:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.c,v 1.37 2018/08/27 06:07:58 riastradh Exp $ */
+/* $NetBSD: i915_gem.c,v 1.38 2018/08/27 06:33:34 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.37 2018/08/27 06:07:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.38 2018/08/27 06:33:34 riastradh Exp $");
#ifdef __NetBSD__
#if 0 /* XXX uvmhist option? */
@@ -5740,7 +5740,6 @@ void i915_gem_track_fb(struct drm_i915_g
new->frontbuffer_bits |= frontbuffer_bits;
}
}
-#endif
/* All the new VM stuff */
u64 i915_gem_obj_offset(struct drm_i915_gem_object *o,
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.7 Mon Aug 27 06:33:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Mon Aug 27 06:33:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.7 2018/08/27 06:33:21 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.8 2018/08/27 06:33:34 riastradh Exp $ */
/*
* Copyright © 2010 Daniel Vetter
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.7 2018/08/27 06:33:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.8 2018/08/27 06:33:34 riastradh Exp $");
#include <linux/err.h>
#include <linux/seq_file.h>
@@ -1606,7 +1606,6 @@ free_scratch:
gen8_free_scratch(&ppgtt->base);
return ret;
}
-#endif
#ifndef __NetBSD__
static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)
