Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:18:35 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c i915_drv.h
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.h
Log Message:
Provide declarations, we use these from different files.
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
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_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.33 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.34
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.33 Sun Dec 19 11:18:26 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:18:35 2021
@@ -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 @@ get_suspend_mode(struct drm_i915_private
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;
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.41 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.42
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.41 Sun Dec 19 11:18:18 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Dec 19 11:18:35 2021
@@ -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 @@ extern const struct dev_pm_ops i915_pm_o
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);
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.3 Sun Dec 19 11:17:35 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h Sun Dec 19 11:18:35 2021
@@ -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 i915_mmap_offset;
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
