[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 #ifdef custodial service

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49217f294dfb
branches:  trunk
changeset: 834822:49217f294dfb
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:33:34 2018 +0000

description:
#ifdef custodial service

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c     |  5 ++---
 sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r da5d5c96052e -r 49217f294dfb sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 06:33:21 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 06:33:34 2018 +0000
@@ -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 @@
                new->frontbuffer_bits |= frontbuffer_bits;
        }
 }
-#endif
 
 /* All the new VM stuff */
 u64 i915_gem_obj_offset(struct drm_i915_gem_object *o,
diff -r da5d5c96052e -r 49217f294dfb sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c        Mon Aug 27 06:33:21 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c        Mon Aug 27 06:33:34 2018 +0000
@@ -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 @@
        gen8_free_scratch(&ppgtt->base);
        return ret;
 }
-#endif
 
 #ifndef __NetBSD__
 static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)