[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Move local diff's locati...

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

details:   https://anonhg.NetBSD.org/src/rev/e55b38dde1f3
branches:  trunk
changeset: 1028555:e55b38dde1f3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:19:01 2021 +0000

description:
Move local diff's location to above where it's used


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (49 lines):

diff -r 107e51679894 -r e55b38dde1f3 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:19:01 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.36 2021/12/19 11:18:52 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.37 2021/12/19 11:19:01 riastradh Exp $  */
 
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
  */
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.36 2021/12/19 11:18:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.37 2021/12/19 11:19:01 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -2845,6 +2845,16 @@
        DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW),
 };
 
+#ifdef __NetBSD__
+
+static const struct uvm_pagerops i915_gem_uvm_ops = {
+       .pgo_reference = drm_gem_pager_reference,
+       .pgo_detach = drm_gem_pager_detach,
+       .pgo_fault = i915_gem_fault,
+};
+
+#endif
+
 static struct drm_driver driver = {
        /* Don't use MTRRs here; the Xserver or userspace app should
         * deal with them for Intel hardware.
@@ -2894,13 +2904,3 @@
        .minor = DRIVER_MINOR,
        .patchlevel = DRIVER_PATCHLEVEL,
 };
-
-#ifdef __NetBSD__
-
-static const struct uvm_pagerops i915_gem_uvm_ops = {
-       .pgo_reference = drm_gem_pager_reference,
-       .pgo_detach = drm_gem_pager_detach,
-       .pgo_fault = i915_gem_fault,
-};
-
-#endif