[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Provide declarations, we...

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

details:   https://anonhg.NetBSD.org/src/rev/149b850752de
branches:  trunk
changeset: 1028552:149b850752de
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:18:35 2021 +0000

description:
Provide declarations, we use these from different files.


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

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h |  7 +++++--
 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c          |  6 +++---
 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h          |  7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r fc135c7cdc43 -r 149b850752de sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h   Sun Dec 19 11:18:26 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h   Sun Dec 19 11:18:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_mman.h,v 1.3 2021/12/19 11:17:35 riastradh Exp $      */
+/*     $NetBSD: i915_gem_mman.h,v 1.4 2021/12/19 11:18:35 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -20,7 +20,10 @@
 struct mutex;
 
 int i915_gem_mmap_gtt_version(void);
-#ifdef __linux__
+#ifdef __NetBSD__
+int i915_gem_fault(struct uvm_faultinfo *, vaddr_t, struct vm_page **,
+    int, int, vm_prot_t, int);
+#else
 int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 #endif
 
diff -r fc135c7cdc43 -r 149b850752de 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:26 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.33 2021/12/19 11:18:26 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.34 2021/12/19 11:18:35 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.33 2021/12/19 11:18:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.34 2021/12/19 11:18:35 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -1814,7 +1814,7 @@
        return I915_DRM_SUSPEND_MEM;
 }
 
-static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
+int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
 {
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct pci_dev *pdev = dev_priv->drm.pdev;
diff -r fc135c7cdc43 -r 149b850752de sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Dec 19 11:18:26 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Dec 19 11:18:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.41 2021/12/19 11:18:18 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.42 2021/12/19 11:18:35 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -1817,6 +1817,11 @@
 int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 void i915_driver_remove(struct drm_i915_private *i915);
 
+int i915_drm_resume(struct drm_device *);
+int i915_drm_resume_early(struct drm_device *);
+int i915_drm_suspend(struct drm_device *);
+int i915_drm_suspend_late(struct drm_device *, bool);
+
 int i915_resume_switcheroo(struct drm_i915_private *i915);
 int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);