CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Tue Jul 2 20:09:21 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd
Log Message:
i915: Update i915drmkms2netbsd to prepare for new import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd
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/i915drm/i915drmkms2netbsd
diff -u src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.3 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.4
--- src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.3 Sun Dec 19 00:25:19 2021
+++ src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Tue Jul 2 20:09:21 2024
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: i915drmkms2netbsd,v 1.3 2021/12/19 00:25:19 riastradh Exp $
+# $NetBSD: i915drmkms2netbsd,v 1.4 2024/07/02 20:09:21 riastradh Exp $
#
# $ /path/to/i915drmkms2netbsd > /path/to/files.i915drmkms.new
#
@@ -22,6 +22,13 @@ i915drmkms_flag=i915drmkms
printf 'include Makefile\n'
} | env \
env CONFIG_ACPI=y \
+ env CONFIG_COMPAT=y \
+ env CONFIG_PERF_EVENTS=y \
+ env CONFIG_X86=y \
+ env CONFIG_HWMON=y \
+ env CONFIG_DRM_I915_PXP=y \
+ env CONFIG_DRM_I915_CAPTURE_ERROR=y \
+ env CONFIG_DRM_I915=y \
env CONFIG_DRM_FBDEV_EMULATION=y \
env src=. \
${GMAKE} -f - -s show-i915-y \
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Tue Jul 2 20:09:21 UTC 2024 Modified Files: src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd Log Message: i915: Update i915drmkms2netbsd to prepare for new import. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: mrg Date: Tue Sep 5 06:08:02 UTC 2023 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: match warnings with the module build, fixes i386 with GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: mrg
Date: Tue Sep 5 06:08:02 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
match warnings with the module build, fixes i386 with GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.90 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.91
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.90 Sat Jun 3 21:31:46 2023
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Tue Sep 5 06:08:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.90 2023/06/03 21:31:46 lukem Exp $
+# $NetBSD: files.i915drmkms,v 1.91 2023/09/05 06:08:02 mrg Exp $
version 20180827
@@ -44,17 +44,19 @@ makeoptions i915drmkms "CWARNFLAGS.i915d
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-pointer-arith"
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-shadow"
+makeoptions i915drmkms "CWARNFLAGS.i915_irq.c"+="${CC_WNO_MAYBE_UNINITIALIZED}"
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
makeoptions i915drmkms "CWARNFLAGS.i915_sw_fence.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
-makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${CC_WNO_MAYBE_UNINITIALIZED}"
-
-makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${CC_WNO_MAYBE_UNINITIALIZED} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
-makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions i915drmkms "CWARNFLAGS.intel_guc_submission.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
makeoptions i915drmkms "CWARNFLAGS.intel_hdmi.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${CC_WNO_MAYBE_UNINITIALIZED} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions i915drmkms "CWARNFLAGS.intel_dp.c"+="${CC_WNO_STRINGOP_OVERREAD}"
+makeoptions i915drmkms "CWARNFLAGS.intel_pm.c"+="${CC_WNO_STRINGOP_OVERREAD} ${CC_WNO_STRINGOP_OVERFLOW}"
makeoptions i915drmkms "CWARNFLAGS.intel_sdvo.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${CC_WNO_MAYBE_UNINITIALIZED}"
makeoptions intelfb "CPPFLAGS.intelfb"+="${CPPFLAGS.i915drmkms}"
makeoptions intelfb "CWARNFLAGS.intelfb"+="${CWARNFLAGS.i915drmkms}"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: nat Date: Mon May 22 22:36:53 UTC 2023 Modified Files: src/sys/external/bsd/drm2/i915drm: intelfb.c Log Message: Use the offset in mmap calculations. It fixes wsfb(4) when used with intelfb(4). Ok riastradh@ XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/i915drm/intelfb.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/i915drm/intelfb.c diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.25 --- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24 Mon Jul 18 23:34:02 2022 +++ src/sys/external/bsd/drm2/i915drm/intelfb.c Mon May 22 22:36:53 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $ */ +/* $NetBSD: intelfb.c,v 1.25 2023/05/22 22:36:53 nat Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.25 2023/05/22 22:36:53 nat Exp $"); #include #include @@ -181,8 +181,8 @@ intelfb_drmfb_mmapfb(struct drmfb_softc KASSERT(0 <= offset); KASSERT(offset < vma->node.size); - return bus_space_mmap(dev->bst, ggtt->gmadr.start, vma->node.start, - prot, BUS_SPACE_MAP_PREFETCHABLE); + return bus_space_mmap(dev->bst, ggtt->gmadr.start, + vma->node.start + offset, prot, BUS_SPACE_MAP_PREFETCHABLE); } static void
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: nat Date: Mon May 22 22:36:53 UTC 2023 Modified Files: src/sys/external/bsd/drm2/i915drm: intelfb.c Log Message: Use the offset in mmap calculations. It fixes wsfb(4) when used with intelfb(4). Ok riastradh@ XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/i915drm/intelfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sat Oct 15 15:20:06 UTC 2022 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Log Message: i915: Suspend ioctls while device is suspended. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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/i915drm/i915_pci_autoconf.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.13 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.14 --- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.13 Thu Sep 22 14:37:38 2022 +++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sat Oct 15 15:20:06 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci_autoconf.c,v 1.13 2022/09/22 14:37:38 riastradh Exp $ */ +/* $NetBSD: i915_pci_autoconf.c,v 1.14 2022/10/15 15:20:06 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.13 2022/09/22 14:37:38 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.14 2022/10/15 15:20:06 riastradh Exp $"); #include #include @@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: i915_pci_aut #include #include +#include #include #include "i915_drv.h" @@ -255,6 +256,8 @@ i915drmkms_suspend(device_t self, const struct drm_device *const dev = sc->sc_drm_dev; int ret; + drm_suspend_ioctl(dev); + ret = i915_drm_prepare(dev); if (ret) return false; @@ -277,12 +280,13 @@ i915drmkms_resume(device_t self, const p ret = i915_drm_resume_early(dev); if (ret) - return false; + goto out; ret = i915_drm_resume(dev); if (ret) - return false; + goto out; - return true; +out: drm_resume_ioctl(dev); + return ret == 0; } static void
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sat Oct 15 15:20:06 UTC 2022 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Log Message: i915: Suspend ioctls while device is suspended. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Jul 17 14:10:43 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_module.c
Log Message:
i915: Omit needless i915_global_buddy_init declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/i915drm/i915_module.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/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.18 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.19
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.18 Sun Feb 27 21:22:01 2022
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Sun Jul 17 14:10:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_module.c,v 1.18 2022/02/27 21:22:01 riastradh Exp $ */
+/* $NetBSD: i915_module.c,v 1.19 2022/07/17 14:10:43 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.18 2022/02/27 21:22:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.19 2022/07/17 14:10:43 riastradh Exp $");
#include
#include
@@ -58,8 +58,6 @@ struct drm_sysctl_def i915_def = DRM_SYS
extern spinlock_t i915_sw_fence_lock;
extern spinlock_t *const i915_schedule_lock;
-int i915_global_buddy_init(void); /* XXX */
-
static int
i915drmkms_init(void)
{
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Jul 17 14:10:43 UTC 2022 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_module.c Log Message: i915: Omit needless i915_global_buddy_init declaration. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/i915drm/i915_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Jul 17 14:10:32 UTC 2022 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Removed Files: src/sys/external/bsd/drm2/i915drm: i915_perf.c Log Message: i915: Remove spurious local i915_perf.c override. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/i915drm/i915_perf.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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.86 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.87 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.86 Sun Feb 27 21:22:01 2022 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Jul 17 14:10:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.86 2022/02/27 21:22:01 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.87 2022/07/17 14:10:32 riastradh Exp $ version 20180827 @@ -66,7 +66,6 @@ file external/bsd/drm2/i915drm/intelfb.c # Local overrides file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms file external/bsd/drm2/i915drm/i915_gemfs.c i915drmkms -file external/bsd/drm2/i915drm/i915_perf.c i915drmkms file external/bsd/drm2/i915drm/i915_switcheroo.c i915drmkms file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms file external/bsd/drm2/i915drm/i915_trace_points.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Jul 17 14:10:32 UTC 2022 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Removed Files: src/sys/external/bsd/drm2/i915drm: i915_perf.c Log Message: i915: Remove spurious local i915_perf.c override. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/i915drm/i915_perf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Mon Dec 20 14:52:25 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
i915: Mark a KASSERT-only variable __diagused.
Minor KNF fix while here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.10 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.11
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.10 Sun Dec 19 12:28:12 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Mon Dec 20 14:52:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $");
#include
#include
@@ -104,7 +104,8 @@ i915drmkms_pci_lookup(const struct pci_a
return NULL;
const struct pci_device_id *ent = _device_ids[i];
- const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
+ const struct intel_device_info *const info =
+ (struct intel_device_info *)ent->driver_data;
if (info->require_force_probe) {
printf("i915drmkms: preliminary hardware support disabled\n");
@@ -171,7 +172,8 @@ i915drmkms_attach_real(device_t self)
struct i915drmkms_softc *const sc = device_private(self);
struct pci_attach_args *const pa = >sc_pa;
const struct pci_device_id *ent = i915drmkms_pci_lookup(pa);
- const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
+ const struct intel_device_info *const info __diagused =
+ (struct intel_device_info *)ent->driver_data;
int error;
KASSERT(info != NULL);
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Dec 20 14:52:25 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Log Message: i915: Mark a KASSERT-only variable __diagused. Minor KNF fix while here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 12:27:02 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: intel_gtt_subr.c
Log Message:
i915: Figure out the graphics stolen memory base.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.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/i915drm/intel_gtt_subr.c
diff -u src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.1 src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.2
--- src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c:1.1 Sun Dec 19 11:45:01 2021
+++ src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c Sun Dec 19 12:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_gtt_subr.c,v 1.1 2021/12/19 11:45:01 riastradh Exp $ */
+/* $NetBSD: intel_gtt_subr.c,v 1.2 2021/12/19 12:27:02 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Intel GTT stubs */
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_gtt_subr.c,v 1.1 2021/12/19 11:45:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt_subr.c,v 1.2 2021/12/19 12:27:02 riastradh Exp $");
#include
#include
@@ -45,39 +45,397 @@ __KERNEL_RCSID(0, "$NetBSD: intel_gtt_su
#include
#include
+#include
#include
+#include "drm/i915_drm.h"
#include "drm/intel-gtt.h"
+static uint8_t
+pci_conf_read8(pci_chipset_tag_t pc, pcitag_t tag, bus_size_t reg)
+{
+ uint32_t v;
+
+ v = pci_conf_read(pc, tag, reg & ~3);
+
+ return 0xff & (v >> (8 * (reg & 3)));
+}
+
+static uint8_t
+pci_read8(pci_chipset_tag_t pc, int bus, int dev, int func, bus_size_t reg)
+{
+ pcitag_t tag = pci_make_tag(pc, bus, dev, func);
+
+ return pci_conf_read8(pc, tag, reg);
+}
+
+static uint16_t
+pci_conf_read16(pci_chipset_tag_t pc, pcitag_t tag, bus_size_t reg)
+{
+ uint32_t v;
+
+ KASSERT((reg & 1) == 0);
+
+ v = pci_conf_read(pc, tag, reg & ~2);
+
+ return 0x & (v >> (8 * (reg & 2)));
+}
+
+static uint16_t
+pci_read16(pci_chipset_tag_t pc, int bus, int dev, int func, bus_size_t reg)
+{
+ pcitag_t tag = pci_make_tag(pc, bus, dev, func);
+
+ return pci_conf_read16(pc, tag, reg);
+}
+
/* Access to this should be single-threaded. */
static struct {
bus_dma_segment_t scratch_seg;
bus_dmamap_t scratch_map;
} intel_gtt;
+/* XXX This logic should be merged with agp_i810.c. */
struct resource intel_graphics_stolen_res;
+static bus_size_t
+i830_tseg_size(pci_chipset_tag_t pc)
+{
+ uint8_t esmramc = pci_read8(pc, 0, 0, 0, I830_ESMRAMC);
+
+ if ((esmramc & TSEG_ENABLE) == 0)
+ return 0;
+
+ return (esmramc & I830_TSEG_SIZE_1M) ? 1024*1024 : 512*1024;
+}
+
+static bus_size_t
+i845_tseg_size(pci_chipset_tag_t pc)
+{
+ uint8_t esmramc = pci_read8(pc, 0, 0, 0, I845_ESMRAMC);
+
+ if ((esmramc & TSEG_ENABLE) == 0)
+ return 0;
+
+ switch (esmramc & I845_TSEG_SIZE_MASK) {
+ case I845_TSEG_SIZE_512K:
+ return 512*1024;
+ case I845_TSEG_SIZE_1M:
+ return 1024*1024;
+ default:
+ return 0;
+ }
+}
+
+static bus_size_t
+i85x_tseg_size(pci_chipset_tag_t pc)
+{
+ uint8_t esmramc = pci_read8(pc, 0, 0, 0, I85X_ESMRAMC);
+
+ if ((esmramc & TSEG_ENABLE) == 0)
+ return 0;
+
+ return 1024*1024;
+}
+
+static bus_size_t
+i830_tom(pci_chipset_tag_t pc)
+{
+ uint8_t drb3 = pci_read8(pc, 0, 0, 0, I830_DRB3);
+
+ return (bus_size_t)32*1024*1024 * drb3;
+}
+
+static bus_size_t
+i85x_tom(pci_chipset_tag_t pc)
+{
+ uint8_t drb3 = pci_read8(pc, 0, 0, 1, I85X_DRB3);
+
+ return (bus_size_t)32*1024*1024 * drb3;
+}
+
+static bus_size_t
+i830_stolen_size(pci_chipset_tag_t pc, pcitag_t tag)
+{
+ uint16_t gmch_ctrl = pci_read16(pc, 0, 0, 0, I830_GMCH_CTRL);
+
+ switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+ case I830_GMCH_GMS_STOLEN_512:
+ return 512*1024;
+ case I830_GMCH_GMS_STOLEN_1024:
+ return 1024*1024;
+ case I830_GMCH_GMS_STOLEN_8192:
+ return 8*1024*1024;
+ case I830_GMCH_GMS_LOCAL:
+ default:
+ aprint_error("%s: invalid gmch_ctrl 0x%04x\n", __func__,
+ gmch_ctrl);
+ return 0;
+ }
+}
+
+static bus_size_t
+gen3_stolen_size(pci_chipset_tag_t pc, pcitag_t tag)
+{
+ uint16_t gmch_ctrl = pci_read16(pc, 0, 0, 0, I830_GMCH_CTRL);
+
+ switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
+ case I855_GMCH_GMS_STOLEN_1M:
+ return 1024*1024;
+ case I855_GMCH_GMS_STOLEN_4M:
+ return 4*1024*1024;
+ case I855_GMCH_GMS_STOLEN_8M:
+ return 8*1024*1024;
+ case I855_GMCH_GMS_STOLEN_16M:
+ return 16*1024*1024;
+ case I855_GMCH_GMS_STOLEN_32M:
+ return 32*1024*1024;
+ case I915_GMCH_GMS_STOLEN_48M:
+ return 48*1024*1024;
+ case I915_GMCH_GMS_STOLEN_64M:
+ return 64*1024*1024;
+ case G33_GMCH_GMS_STOLEN_128M:
+ return 128*1024*1024;
+ case G33_GMCH_GMS_STOLEN_256M:
+ return 256*1024*1024;
+ case INTEL_GMCH_GMS_STOLEN_96M:
+ return 96*1024*1024;
+ case INTEL_GMCH_GMS_STOLEN_160M:
+ return 160*1024*1024;
+ case INTEL_GMCH_GMS_STOLEN_224M:
+ return 224*1024*1024;
+ case
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:27:02 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: intel_gtt_subr.c Log Message: i915: Figure out the graphics stolen memory base. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/intel_gtt_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 12:10:34 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c Log Message: i915: Initialize userptr wq for now. Should wire this up for real! To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 12:10:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c
Log Message:
i915: Initialize userptr wq for now. Should wire this up for real!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.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/i915drm/i915_gem_userptr.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.4 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.5
--- src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.4 Sun Dec 19 11:33:49 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Sun Dec 19 12:10:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_userptr.c,v 1.4 2021/12/19 11:33:49 riastradh Exp $ */
+/* $NetBSD: i915_gem_userptr.c,v 1.5 2021/12/19 12:10:34 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,20 +30,39 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.4 2021/12/19 11:33:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.5 2021/12/19 12:10:34 riastradh Exp $");
#include "i915_drv.h"
#include "../dist/drm/i915/gem/i915_gem_ioctls.h"
+#include
+
+/*
+ * XXX this file is dumb and maybe shouldn't exist; it exists because
+ * riastradh is a lazybones
+ */
+
int
-i915_gem_init_userptr(struct drm_i915_private *i915)
+i915_gem_init_userptr(struct drm_i915_private *dev_priv)
{
+ mutex_init(_priv->mm_lock);
+ hash_init(dev_priv->mm_structs);
+
+ dev_priv->mm.userptr_wq =
+ alloc_workqueue("i915-userptr-acquire",
+WQ_HIGHPRI | WQ_UNBOUND,
+0);
+ if (!dev_priv->mm.userptr_wq)
+ return -ENOMEM;
+
return 0;
}
void
-i915_gem_cleanup_userptr(struct drm_i915_private *i915)
+i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv)
{
+ destroy_workqueue(dev_priv->mm.userptr_wq);
+ mutex_destroy(_priv->mm_lock);
}
int
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:53:02 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
Return pci_device_t from match so we can call i915_driver_probe
Author: Maya Rashish
Committer: Taylor R Campbell
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.5 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.6
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.5 Sun Dec 19 11:33:49 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:53:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.5 2021/12/19 11:33:49 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.6 2021/12/19 11:53:02 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.5 2021/12/19 11:33:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.6 2021/12/19 11:53:02 riastradh Exp $");
#include
#include
@@ -64,7 +64,7 @@ struct i915drmkms_softc {
boolsc_dev_registered;
};
-static const struct intel_device_info *
+static const struct pci_device_id *
i915drmkms_pci_lookup(const struct pci_attach_args *);
static int i915drmkms_match(device_t, cfdata_t, void *);
@@ -85,7 +85,7 @@ extern struct drm_driver *const i915_drm
extern const struct pci_device_id *const i915_device_ids;
extern const size_t i915_n_device_ids;
-static const struct intel_device_info *
+static const struct pci_device_id *
i915drmkms_pci_lookup(const struct pci_attach_args *pa)
{
size_t i;
@@ -110,15 +110,15 @@ i915drmkms_pci_lookup(const struct pci_a
if (i == i915_n_device_ids)
return NULL;
- const struct intel_device_info *const info =
- (const void *)(uintptr_t)i915_device_ids[i].driver_data;
+ const struct pci_device_id *ent = _device_ids[i];
+ const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
if (info->require_force_probe) {
printf("i915drmkms: preliminary hardware support disabled\n");
return NULL;
}
- return info;
+ return ent;
}
static int
@@ -168,9 +168,8 @@ i915drmkms_attach_real(device_t self)
{
struct i915drmkms_softc *const sc = device_private(self);
struct pci_attach_args *const pa = >sc_pa;
- const struct intel_device_info *const info = i915drmkms_pci_lookup(pa);
- const unsigned long cookie =
- (unsigned long)(uintptr_t)(const void *)info;
+ const struct pci_device_id *ent = i915drmkms_pci_lookup(pa);
+ const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
int error;
KASSERT(info != NULL);
@@ -198,7 +197,7 @@ i915drmkms_attach_real(device_t self)
sc->sc_pci_attached = true;
/* XXX errno Linux->NetBSD */
- error = -drm_dev_register(sc->sc_drm_dev, cookie);
+ error = -i915_driver_probe(>sc_pci_dev, ent);
if (error) {
aprint_error_dev(self, "unable to register drm: %d\n", error);
return;
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:53:02 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Log Message: Return pci_device_t from match so we can call i915_driver_probe Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:49:47 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_trace_points.c Log Message: i915: Define trace points To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_trace_points.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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.79 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.80 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.79 Sun Dec 19 11:49:12 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:49:46 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.79 2021/12/19 11:49:12 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.80 2021/12/19 11:49:46 riastradh Exp $ version 20180827 @@ -65,6 +65,7 @@ file external/bsd/drm2/i915drm/i915_gemf file external/bsd/drm2/i915drm/i915_perf.c i915drmkms file external/bsd/drm2/i915drm/i915_switcheroo.c i915drmkms file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms +file external/bsd/drm2/i915drm/i915_trace_points.c i915drmkms file external/bsd/drm2/i915drm/icl_dsi.c i915drmkms file external/bsd/drm2/i915drm/intel_dsi_dcs_backlight.c i915drmkms file external/bsd/drm2/i915drm/intel_gtt_subr.c i915drmkms Added files: Index: src/sys/external/bsd/drm2/i915drm/i915_trace_points.c diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_trace_points.c:1.1 --- /dev/null Sun Dec 19 11:49:47 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_trace_points.c Sun Dec 19 11:49:46 2021 @@ -0,0 +1,2 @@ +#define CREATE_TRACE_POINTS +#include "i915_trace.h"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:49:47 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_trace_points.c Log Message: i915: Define trace points To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_trace_points.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:39:11 UTC 2021
Added Files:
src/sys/external/bsd/drm2/i915drm: icl_dsi.c
Log Message:
i915: Add missing stub file.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/icl_dsi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/i915drm/icl_dsi.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/icl_dsi.c:1.1
--- /dev/null Sun Dec 19 11:39:11 2021
+++ src/sys/external/bsd/drm2/i915drm/icl_dsi.c Sun Dec 19 11:39:10 2021
@@ -0,0 +1,37 @@
+/* $NetBSD: icl_dsi.c,v 1.1 2021/12/19 11:39:10 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: icl_dsi.c,v 1.1 2021/12/19 11:39:10 riastradh Exp $");
+
+#include "display/intel_dsi.h"
+
+void
+icl_dsi_init(struct drm_i915_private *dev_priv)
+{
+}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:39:11 UTC 2021 Added Files: src/sys/external/bsd/drm2/i915drm: icl_dsi.c Log Message: i915: Add missing stub file. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/icl_dsi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:32:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915_globals.c: don't build, not useful (we don't __init etc) Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.68 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.69 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.68 Sun Dec 19 11:30:45 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:32:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.68 2021/12/19 11:30:45 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.69 2021/12/19 11:32:17 riastradh Exp $ version 20180827 @@ -190,7 +190,7 @@ file external/bsd/drm2/dist/drm/i915/i91 file external/bsd/drm2/dist/drm/i915/i915_gem_fence_reg.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_getparam.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_globals.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_globals.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_irq.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_memcpy.c i915drmkms #file external/bsd/drm2/dist/drm/i915/i915_mm.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:32:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915_globals.c: don't build, not useful (we don't __init etc) Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:31:33 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c Log Message: ../dist/drm/i915/gem/i915_gem_ioctls.h for i915_gem_userptr_ioctl prototype Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.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/i915drm/i915_gem_userptr.c diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.2 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.3 --- src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.2 Sun Dec 19 01:24:06 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Sun Dec 19 11:31:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gem_userptr.c,v 1.2 2021/12/19 01:24:06 riastradh Exp $ */ +/* $NetBSD: i915_gem_userptr.c,v 1.3 2021/12/19 11:31:33 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,9 +30,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.2 2021/12/19 01:24:06 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.3 2021/12/19 11:31:33 riastradh Exp $"); #include "i915_drv.h" +#include "../dist/drm/i915/gem/i915_gem_ioctls.h" int i915_gem_init_userptr(struct drm_i915_private *dev_priv)
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:31:33 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c Log Message: ../dist/drm/i915/gem/i915_gem_ioctls.h for i915_gem_userptr_ioctl prototype Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:20:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Disable i915_active.c for now; needs more work. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.65 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.66 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.65 Sun Dec 19 11:19:55 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:20:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.65 2021/12/19 11:19:55 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.66 2021/12/19 11:20:18 riastradh Exp $ version 20180827 @@ -182,7 +182,7 @@ file external/bsd/drm2/dist/drm/i915/gt/ file external/bsd/drm2/dist/drm/i915/gt/uc/intel_huc_fw.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/uc/intel_uc.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/uc/intel_uc_fw.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_active.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_active.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_buddy.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_drv.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:20:18 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Disable i915_active.c for now; needs more work. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:19:55 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms i915_sw_fence.h
Log Message:
i915: Touch up local i915_sw_fence stubs to make it compile.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.64 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.65
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.64 Sun Dec 19 11:19:47 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:19:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.64 2021/12/19 11:19:47 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.65 2021/12/19 11:19:55 riastradh Exp $
version 20180827
@@ -203,7 +203,7 @@ file external/bsd/drm2/dist/drm/i915/i91
file external/bsd/drm2/dist/drm/i915/i915_scatterlist.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_scheduler.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_suspend.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms
+#file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_sw_fence_work.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_switcheroo.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_syncmap.c i915drmkms
Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h
diff -u src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.3 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.4
--- src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.3 Sun Dec 19 01:46:32 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 11:19:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_sw_fence.h,v 1.3 2021/12/19 01:46:32 riastradh Exp $ */
+/* $NetBSD: i915_sw_fence.h,v 1.4 2021/12/19 11:19:55 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,8 +38,9 @@
#include
struct dma_fence_ops;
+struct dma_resv;
struct i915_sw_fence;
-struct reservation_object;
+struct i915_sw_fence_cb;
struct i915_sw_fence {
char dummy;
@@ -49,6 +50,10 @@ struct i915_sw_fence_wait {
char dummy;
};
+struct i915_sw_dma_fence_cb {
+ char dummy;
+};
+
enum i915_sw_fence_notify {
FENCE_COMPLETE,
FENCE_FREE,
@@ -63,7 +68,7 @@ void i915_sw_fence_fini(struct i915_sw_f
bool i915_sw_fence_signaled(struct i915_sw_fence *);
void i915_sw_fence_await_reservation(struct i915_sw_fence *,
- struct reservation_object *, const struct dma_fence_ops *, bool,
+ struct dma_resv *, const struct dma_fence_ops *, bool,
unsigned long, gfp_t);
void i915_sw_fence_await_sw_fence(struct i915_sw_fence *,
struct i915_sw_fence *, struct i915_sw_fence_wait *);
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:19:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms i915_sw_fence.h Log Message: i915: Touch up local i915_sw_fence stubs to make it compile. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:19:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Disable CONFIG_DRM_I915_DEBUG_RUNTIME_PM. No runtime_pm at all here for now. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.63 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.64 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.63 Sun Dec 19 11:19:17 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:19:47 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.63 2021/12/19 11:19:17 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.64 2021/12/19 11:19:47 riastradh Exp $ version 20180827 @@ -22,7 +22,7 @@ makeoptions i915drmkms "CPPFLAGS.i915drm makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG=1" # XXX makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_GEM=1" # XXX -makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_RUNTIME_PM=1" # XXX +makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_RUNTIME_PM=0" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PREEMPT_TIMEOUT=640" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_TIMESLICE_DURATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_ALPHA_SUPPORT=0"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:19:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Disable CONFIG_DRM_I915_DEBUG_RUNTIME_PM. No runtime_pm at all here for now. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:19:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Need to provide a value for CONFIG_DRM_I915_DEBUG_RUNTIME_PM Maybe 1 will do. Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.62 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.63 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.62 Sun Dec 19 11:13:52 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:19:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.62 2021/12/19 11:13:52 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.63 2021/12/19 11:19:17 riastradh Exp $ version 20180827 @@ -22,6 +22,7 @@ makeoptions i915drmkms "CPPFLAGS.i915drm makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG=1" # XXX makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_GEM=1" # XXX +makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_RUNTIME_PM=1" # XXX makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PREEMPT_TIMEOUT=640" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_TIMESLICE_DURATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_ALPHA_SUPPORT=0"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:19:17 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Need to provide a value for CONFIG_DRM_I915_DEBUG_RUNTIME_PM Maybe 1 will do. Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:13:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
i915: Disable -Wmissing-field-initializers.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.61 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.62
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.61 Sun Dec 19 11:13:44 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:13:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.61 2021/12/19 11:13:44 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.62 2021/12/19 11:13:52 riastradh Exp $
version 20180827
@@ -29,8 +29,9 @@ makeoptions i915drmkms "CPPFLAGS.i915drm
makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_GVT=0"
makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
-makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-shadow"
+makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-missing-field-initializers"
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-pointer-arith"
+makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-shadow"
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:13:52 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Disable -Wmissing-field-initializers. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:13:45 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Fix include path for intelfb files too. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.60 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.61 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.60 Sun Dec 19 11:05:33 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:13:44 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.60 2021/12/19 11:05:33 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.61 2021/12/19 11:13:44 riastradh Exp $ version 20180827 @@ -13,6 +13,7 @@ attach intelfb at intelfbbus # overflow is OK. makeoptions i915drmkms "COPTS.i915drmkms"+="-fwrapv" +makeoptions intelfb "CPPFLAGS.intelfb"+="-I$S/external/bsd/drm2/i915drm" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/i915drm" makeoptions intelfb "CPPFLAGS.intelfb"+="-I$S/external/bsd/drm2/dist/drm/i915"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:13:45 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915: Fix include path for intelfb files too. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:05:33 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: define CONFIG values to be the same as linux Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.59 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.60 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.59 Sun Dec 19 11:01:53 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:05:33 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.59 2021/12/19 11:01:53 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.60 2021/12/19 11:05:33 riastradh Exp $ version 20180827 @@ -21,6 +21,8 @@ makeoptions i915drmkms "CPPFLAGS.i915drm makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG=1" # XXX makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_DEBUG_GEM=1" # XXX +makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PREEMPT_TIMEOUT=640" +makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_TIMESLICE_DURATION=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_ALPHA_SUPPORT=0" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_FBDEV=1" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_GVT=0"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:05:33 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: define CONFIG values to be the same as linux Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:01:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Add include flag for intelfb.c's use of i915_drv.h header Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.58 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.59 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.58 Sun Dec 19 10:55:37 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:01:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.58 2021/12/19 10:55:37 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.59 2021/12/19 11:01:53 riastradh Exp $ version 20180827 @@ -15,6 +15,7 @@ makeoptions i915drmkms "COPTS.i915drmkm makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/i915drm" +makeoptions intelfb "CPPFLAGS.intelfb"+="-I$S/external/bsd/drm2/dist/drm/i915" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/dist/drm/i915" makeoptions i915drmkms "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:01:53 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Add include flag for intelfb.c's use of i915_drv.h header Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:20:54 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Merge updated i915drmkms2netbsd output. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.55 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.56 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.55 Sun Dec 19 01:55:21 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 10:20:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.55 2021/12/19 01:55:21 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.56 2021/12/19 10:20:54 riastradh Exp $ version 20180827 @@ -47,6 +47,7 @@ file external/bsd/drm2/i915drm/i915_sysf file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms file external/bsd/drm2/i915drm/intelfb.c intelfb file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms + # Generated from i915drmkms2netbsd. file external/bsd/drm2/dist/drm/i915/display/dvo_ch7017.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/dvo_ch7xxx.c i915drmkms @@ -55,6 +56,7 @@ file external/bsd/drm2/dist/drm/i915/dis file external/bsd/drm2/dist/drm/i915/display/dvo_sil164.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/dvo_tfp410.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/icl_dsi.c i915drmkms +file external/bsd/drm2/dist/drm/i915/display/intel_acpi.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_atomic.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_atomic_plane.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_audio.c i915drmkms # XXX hdaudio @@ -68,12 +70,12 @@ file external/bsd/drm2/dist/drm/i915/dis file external/bsd/drm2/dist/drm/i915/display/intel_ddi.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_display.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_display_power.c i915drmkms -file external/bsd/drm2/dist/drm/i915/display/intel_dp_aux_backlight.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dp.c i915drmkms -file external/bsd/drm2/dist/drm/i915/display/intel_dpio_phy.c i915drmkms +file external/bsd/drm2/dist/drm/i915/display/intel_dp_aux_backlight.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dp_link_training.c i915drmkms -file external/bsd/drm2/dist/drm/i915/display/intel_dpll_mgr.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dp_mst.c i915drmkms +file external/bsd/drm2/dist/drm/i915/display/intel_dpio_phy.c i915drmkms +file external/bsd/drm2/dist/drm/i915/display/intel_dpll_mgr.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dsb.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dsi.c i915drmkms file external/bsd/drm2/dist/drm/i915/display/intel_dsi_dcs_backlight.c i915drmkms @@ -114,8 +116,8 @@ file external/bsd/drm2/dist/drm/i915/gem file external/bsd/drm2/dist/drm/i915/gem/i915_gem_internal.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_lmem.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_blt.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c i915drmkms +file external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_blt.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_pages.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_pm.c i915drmkms @@ -127,6 +129,7 @@ file external/bsd/drm2/dist/drm/i915/gem file external/bsd/drm2/dist/drm/i915/gem/i915_gem_tiling.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_wait.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gem/i915_gemfs.c i915drmkms #file external/bsd/drm2/dist/drm/i915/gt/debugfs_engines.c i915drmkms #file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt.c i915drmkms #file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt_pm.c i915drmkms @@ -163,8 +166,8 @@ file external/bsd/drm2/dist/drm/i915/gt/ file external/bsd/drm2/dist/drm/i915/gt/intel_sseu.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/intel_timeline.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/intel_workarounds.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/uc/intel_guc_ads.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/uc/intel_guc.c i915drmkms +file external/bsd/drm2/dist/drm/i915/gt/uc/intel_guc_ads.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/uc/intel_guc_ct.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/uc/intel_guc_fw.c
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 10:20:54 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Merge updated i915drmkms2netbsd output. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Comment out debugfs files, we probably don't want those. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.54 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.55 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.54 Sun Dec 19 01:51:37 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:55:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.54 2021/12/19 01:51:37 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.55 2021/12/19 01:55:21 riastradh Exp $ version 20180827 @@ -127,9 +127,9 @@ file external/bsd/drm2/dist/drm/i915/gem file external/bsd/drm2/dist/drm/i915/gem/i915_gem_tiling.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c i915drmkms file external/bsd/drm2/dist/drm/i915/gem/i915_gem_wait.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_engines.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt.c i915drmkms -file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt_pm.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_engines.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/gt/debugfs_gt_pm.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen6_ppgtt.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen6_renderstate.c i915drmkms file external/bsd/drm2/dist/drm/i915/gt/gen7_renderstate.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:55:21 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Comment out debugfs files, we probably don't want those. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gemfs.c Log Message: Change local drm files include path to match upstream changes. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gemfs.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/i915drm/i915_gemfs.c diff -u src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.2 --- src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1 Sun Dec 19 01:40:34 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Sun Dec 19 01:54:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $ */ +/* $NetBSD: i915_gemfs.c,v 1.2 2021/12/19 01:54:05 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_gemfs.c,v 1.2 2021/12/19 01:54:05 riastradh Exp $"); -#include "i915_gemfs.h" +#include "gem/i915_gemfs.h" int i915_gemfs_init(struct drm_i915_private *i915)
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:54:05 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gemfs.c Log Message: Change local drm files include path to match upstream changes. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:46:32 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_sw_fence.h
Log Message:
Add some more stub i915_sw_fence prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.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/i915drm/i915_sw_fence.h
diff -u src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.2 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.3
--- src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.2 Sun Dec 19 01:23:59 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 01:46:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_sw_fence.h,v 1.2 2021/12/19 01:23:59 riastradh Exp $ */
+/* $NetBSD: i915_sw_fence.h,v 1.3 2021/12/19 01:46:32 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -45,6 +45,10 @@ struct i915_sw_fence {
char dummy;
};
+struct i915_sw_fence_wait {
+ char dummy;
+};
+
enum i915_sw_fence_notify {
FENCE_COMPLETE,
FENCE_FREE,
@@ -56,11 +60,17 @@ void i915_sw_fence_init(struct i915_sw_f
int (*)(struct i915_sw_fence *, enum i915_sw_fence_notify));
void i915_sw_fence_fini(struct i915_sw_fence *);
+bool i915_sw_fence_signaled(struct i915_sw_fence *);
+
void i915_sw_fence_await_reservation(struct i915_sw_fence *,
struct reservation_object *, const struct dma_fence_ops *, bool,
unsigned long, gfp_t);
+void i915_sw_fence_await_sw_fence(struct i915_sw_fence *,
+ struct i915_sw_fence *, struct i915_sw_fence_wait *);
void i915_sw_fence_await_sw_fence_gfp(struct i915_sw_fence *,
struct i915_sw_fence *, gfp_t);
+int i915_sw_fence_await_dma_fence(struct i915_sw_fence *,
+ struct dma_fence *, int, gfp_t);
void i915_sw_fence_commit(struct i915_sw_fence *);
#endif /* _I915DRM_I915_SW_FENCE_H_ */
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:46:32 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.h Log Message: Add some more stub i915_sw_fence prototypes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:46:16 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
Reflect rename IS_PRELIMINARY_HW -> IS_ALPHA_SUPPORT.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.1 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.2
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.1 Sun Dec 19 01:42:23 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 01:46:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.1 2021/12/19 01:42:23 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.2 2021/12/19 01:46:16 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.1 2021/12/19 01:42:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.2 2021/12/19 01:46:16 riastradh Exp $");
#include
#include
@@ -109,7 +109,7 @@ i915drmkms_pci_lookup(const struct pci_a
const struct intel_device_info *const info =
(const void *)(uintptr_t)i915_device_ids[i].driver_data;
- if (IS_PRELIMINARY_HW(info)) {
+ if (IS_ALPHA_SUPPORT(info)) {
printf("i915drmkms: preliminary hardware support disabled\n");
return NULL;
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:46:16 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Log Message: Reflect rename IS_PRELIMINARY_HW -> IS_ALPHA_SUPPORT. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:44:10 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_perf.c
Log Message:
Fix copypasto.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_perf.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/i915drm/i915_perf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_perf.c:1.1 src/sys/external/bsd/drm2/i915drm/i915_perf.c:1.2
--- src/sys/external/bsd/drm2/i915drm/i915_perf.c:1.1 Sun Dec 19 01:40:34 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_perf.c Sun Dec 19 01:44:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_perf.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $ */
+/* $NetBSD: i915_perf.c,v 1.2 2021/12/19 01:44:10 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_perf.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_perf.c,v 1.2 2021/12/19 01:44:10 riastradh Exp $");
#include "i915_drv.h"
@@ -40,6 +40,6 @@ i915_perf_init(struct drm_i915_private *
}
void
-i915_gemfs_fini(struct drm_i915_private *i915)
+i915_perf_fini(struct drm_i915_private *i915)
{
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:44:10 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_perf.c Log Message: Fix copypasto. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_perf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:42:55 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_sysfs.c
Log Message:
Update i915_setup/teardown_sysfs prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_sysfs.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/i915drm/i915_sysfs.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_sysfs.c:1.2 src/sys/external/bsd/drm2/i915drm/i915_sysfs.c:1.3
--- src/sys/external/bsd/drm2/i915drm/i915_sysfs.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_sysfs.c Sun Dec 19 01:42:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_sysfs.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: i915_sysfs.c,v 1.3 2021/12/19 01:42:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,16 +32,16 @@
/* i915_sysfs.c stubs */
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_sysfs.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_sysfs.c,v 1.3 2021/12/19 01:42:55 riastradh Exp $");
#include "i915_drv.h"
void
-i915_setup_sysfs(struct drm_device *dev __unused)
+i915_setup_sysfs(struct drm_i915_private *dev __unused)
{
}
void
-i915_teardown_sysfs(struct drm_device *dev __unused)
+i915_teardown_sysfs(struct drm_i915_private *dev __unused)
{
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:55 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_sysfs.c Log Message: Update i915_setup/teardown_sysfs prototypes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915_sysfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Disable the i915_oa_* files (for now?). To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.51 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.52 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.51 Sun Dec 19 01:42:39 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:42:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.51 2021/12/19 01:42:39 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.52 2021/12/19 01:42:48 riastradh Exp $ version 20180827 @@ -215,18 +215,18 @@ file external/bsd/drm2/dist/drm/i915/int file external/bsd/drm2/dist/drm/i915/intel_uncore.c i915drmkms file external/bsd/drm2/dist/drm/i915/intel_wakeref.c i915drmkms file external/bsd/drm2/dist/drm/i915/intel_wopcm.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_bdw.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_bxt.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cflgt2.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cflgt3.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_chv.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cnl.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_glk.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_hsw.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_icl.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_kblgt2.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_kblgt3.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt2.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt3.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt4.c i915drmkms -file external/bsd/drm2/dist/drm/i915/oa/i915_oa_tgl.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_bdw.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_bxt.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cflgt2.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cflgt3.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_chv.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_cnl.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_glk.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_hsw.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_icl.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_kblgt2.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_kblgt3.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt2.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt3.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_sklgt4.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/oa/i915_oa_tgl.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:48 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Disable the i915_oa_* files (for now?). To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:42:39 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
The initializers with overrides got moved to i915_pci.c.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.50 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.51
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.50 Sun Dec 19 01:42:31 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:42:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.50 2021/12/19 01:42:31 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.51 2021/12/19 01:42:39 riastradh Exp $
version 20180827
@@ -28,8 +28,8 @@ makeoptions i915drmkms CPPFLAGS+="-DCONF
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-shadow"
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-pointer-arith"
-makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
-makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
+makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
+makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:39 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: The initializers with overrides got moved to i915_pci.c. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:31 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Disable i915 alpha hardware support. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.49 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.50 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.49 Sun Dec 19 01:42:23 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:42:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.49 2021/12/19 01:42:23 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.50 2021/12/19 01:42:31 riastradh Exp $ version 20180827 @@ -20,6 +20,7 @@ makeoptions i915drmkms CPPFLAGS+="-I$S/e makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1" makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_DEBUG=1" # XXX makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_DEBUG_GEM=1" # XXX +makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_ALPHA_SUPPORT=0" makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1" makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_GVT=0" makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:31 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Disable i915 alpha hardware support. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:42:23 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Added Files:
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Removed Files:
src/sys/external/bsd/drm2/i915drm: i915_pci.c
Log Message:
i915_pci.c collides; rename ours to i915_pci_autoconf.c.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.21 -r0 src/sys/external/bsd/drm2/i915drm/i915_pci.c
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.48 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.49
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.48 Sun Dec 19 01:40:34 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.48 2021/12/19 01:40:34 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.49 2021/12/19 01:42:23 riastradh Exp $
version 20180827
@@ -39,7 +39,7 @@ makeoptions i915drmkms "CWARNFLAGS.int
file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms
file external/bsd/drm2/i915drm/i915_gemfs.c i915drmkms
file external/bsd/drm2/i915drm/i915_module.c i915drmkms
-file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
+file external/bsd/drm2/i915drm/i915_pci_autoconf.c i915drmkms
file external/bsd/drm2/i915drm/i915_perf.c i915drmkms
file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms
file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms
Added files:
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.1
--- /dev/null Sun Dec 19 01:42:23 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 01:42:23 2021
@@ -0,0 +1,309 @@
+/* $NetBSD: i915_pci_autoconf.c,v 1.1 2021/12/19 01:42:23 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.1 2021/12/19 01:42:23 riastradh Exp $");
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "i915_drv.h"
+#include "i915_pci.h"
+
+SIMPLEQ_HEAD(i915drmkms_task_head, i915drmkms_task);
+
+struct i915drmkms_softc {
+ device_t sc_dev;
+ struct pci_attach_args sc_pa;
+ enum {
+ I915DRMKMS_TASK_ATTACH,
+ I915DRMKMS_TASK_WORKQUEUE,
+ }sc_task_state;
+ union {
+ struct workqueue *workqueue;
+ struct i915drmkms_task_head attach;
+ }sc_task_u;
+ struct drm_device *sc_drm_dev;
+ struct pci_dev sc_pci_dev;
+};
+
+static const struct intel_device_info *
+ i915drmkms_pci_lookup(const struct pci_attach_args *);
+
+static int i915drmkms_match(device_t, cfdata_t, void *);
+static void i915drmkms_attach(device_t, device_t, void *);
+static void i915drmkms_attach_real(device_t);
+static int i915drmkms_detach(device_t, int);
+
+static bool i915drmkms_suspend(device_t, const pmf_qual_t *);
+static bool i915drmkms_resume(device_t, const pmf_qual_t *);
+
+static void i915drmkms_task_work(struct work *, void *);
+
+CFATTACH_DECL_NEW(i915drmkms, sizeof(struct i915drmkms_softc),
+i915drmkms_match, i915drmkms_attach, i915drmkms_detach, NULL);
+
+/* XXX Kludge to get
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:42:23 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c Removed Files: src/sys/external/bsd/drm2/i915drm: i915_pci.c Log Message: i915_pci.c collides; rename ours to i915_pci_autoconf.c. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.21 -r0 src/sys/external/bsd/drm2/i915drm/i915_pci.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:41:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_module.c Log Message: No more load-time hacking of the struct drm_driver structure, yay! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/i915drm/i915_module.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/i915drm/i915_module.c diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.8 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.9 --- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.8 Tue Aug 28 03:35:08 2018 +++ src/sys/external/bsd/drm2/i915drm/i915_module.c Sun Dec 19 01:41:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_module.c,v 1.8 2018/08/28 03:35:08 riastradh Exp $ */ +/* $NetBSD: i915_module.c,v 1.9 2021/12/19 01:41:35 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.8 2018/08/28 03:35:08 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.9 2021/12/19 01:41:35 riastradh Exp $"); #include #include @@ -50,11 +50,6 @@ MODULE(MODULE_CLASS_DRIVER, i915drmkms, #include "ioconf.c" #endif -/* XXX Kludge to get these from i915_drv.c. */ -extern struct drm_driver *const i915_drm_driver; -extern const struct pci_device_id *const i915_device_ids; -extern const size_t i915_n_device_ids; - struct drm_sysctl_def i915_def = DRM_SYSCTL_INIT(); static int @@ -66,10 +61,6 @@ i915drmkms_init(void) if (error) return error; - i915_drm_driver->num_ioctls = i915_max_ioctl; - i915_drm_driver->driver_features |= DRIVER_MODESET; - i915_drm_driver->driver_features &= ~DRIVER_USE_AGP; - drm_sysctl_init(_def); spin_lock_init(_lock);
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:41:35 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_module.c Log Message: No more load-time hacking of the struct drm_driver structure, yay! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/i915drm/i915_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:40:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Added Files:
src/sys/external/bsd/drm2/i915drm: i915_gemfs.c i915_perf.c
Log Message:
Stub out i915_gemfs.c and i915_perf.c.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c \
src/sys/external/bsd/drm2/i915drm/i915_perf.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.47 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.48
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.47 Sun Dec 19 01:39:48 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:40:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.47 2021/12/19 01:39:48 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.48 2021/12/19 01:40:34 riastradh Exp $
version 20180827
@@ -37,13 +37,15 @@ makeoptions i915drmkms "CWARNFLAGS.int
makeoptions i915drmkms "CWARNFLAGS.intel_sdvo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"
file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms
+file external/bsd/drm2/i915drm/i915_gemfs.c i915drmkms
file external/bsd/drm2/i915drm/i915_module.c i915drmkms
file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
+file external/bsd/drm2/i915drm/i915_perf.c i915drmkms
file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms
file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms
-file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms
file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
file external/bsd/drm2/i915drm/intelfb.c intelfb
+file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms
# Generated from i915drmkms2netbsd.
file external/bsd/drm2/dist/drm/i915/display/dvo_ch7017.c i915drmkms
file external/bsd/drm2/dist/drm/i915/display/dvo_ch7xxx.c i915drmkms
@@ -109,7 +111,6 @@ file external/bsd/drm2/dist/drm/i915/gem
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_domain.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_execbuffer.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_fence.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/gem/i915_gemfs.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_internal.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_lmem.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c i915drmkms
@@ -187,7 +188,6 @@ file external/bsd/drm2/dist/drm/i915/i91
#file external/bsd/drm2/dist/drm/i915/i915_mm.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_params.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_pci.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/i915_perf.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_query.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_request.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_scatterlist.c i915drmkms
Added files:
Index: src/sys/external/bsd/drm2/i915drm/i915_gemfs.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1
--- /dev/null Sun Dec 19 01:40:34 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Sun Dec 19 01:40:34 2021
@@ -0,0 +1,46 @@
+/* $NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:40:34 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_gemfs.c i915_perf.c Log Message: Stub out i915_gemfs.c and i915_perf.c. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c \ src/sys/external/bsd/drm2/i915drm/i915_perf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:39:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915_mm.c is of no use to us. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.46 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.47 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.46 Sun Dec 19 01:24:26 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:39:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.46 2021/12/19 01:24:26 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.47 2021/12/19 01:39:48 riastradh Exp $ version 20180827 @@ -184,7 +184,7 @@ file external/bsd/drm2/dist/drm/i915/i91 file external/bsd/drm2/dist/drm/i915/i915_globals.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_irq.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_memcpy.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_mm.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_mm.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_params.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_pci.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_perf.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:39:49 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915_mm.c is of no use to us. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:24:06 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c
Log Message:
Update i915_gem_init_userptr signature.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.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/i915drm/i915_gem_userptr.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.1 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.2
--- src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.1 Mon Aug 27 07:56:13 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Sun Dec 19 01:24:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_userptr.c,v 1.1 2018/08/27 07:56:13 riastradh Exp $ */
+/* $NetBSD: i915_gem_userptr.c,v 1.2 2021/12/19 01:24:06 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.1 2018/08/27 07:56:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.2 2021/12/19 01:24:06 riastradh Exp $");
#include "i915_drv.h"
int
-i915_gem_init_userptr(struct drm_device *dev)
+i915_gem_init_userptr(struct drm_i915_private *dev_priv)
{
return 0;
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:24:06 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c Log Message: Update i915_gem_init_userptr signature. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 01:23:59 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_sw_fence.h
Log Message:
Add i915_sw_fence_await_sw_fence_gfp stub declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.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/i915drm/i915_sw_fence.h
diff -u src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.1 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.2
--- src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.1 Sun Dec 19 00:26:41 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 01:23:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_sw_fence.h,v 1.1 2021/12/19 00:26:41 riastradh Exp $ */
+/* $NetBSD: i915_sw_fence.h,v 1.2 2021/12/19 01:23:59 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -35,11 +35,14 @@
#include
#include
+#include
+
struct dma_fence_ops;
struct i915_sw_fence;
struct reservation_object;
struct i915_sw_fence {
+ char dummy;
};
enum i915_sw_fence_notify {
@@ -56,6 +59,8 @@ void i915_sw_fence_fini(struct i915_sw_f
void i915_sw_fence_await_reservation(struct i915_sw_fence *,
struct reservation_object *, const struct dma_fence_ops *, bool,
unsigned long, gfp_t);
+void i915_sw_fence_await_sw_fence_gfp(struct i915_sw_fence *,
+ struct i915_sw_fence *, gfp_t);
void i915_sw_fence_commit(struct i915_sw_fence *);
#endif /* _I915DRM_I915_SW_FENCE_H_ */
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 01:23:59 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.h Log Message: Add i915_sw_fence_await_sw_fence_gfp stub declaration. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:57:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Added Files:
src/sys/external/bsd/drm2/i915drm: vlv_dsi.c
Removed Files:
src/sys/external/bsd/drm2/i915drm: intel_dsi.c
Log Message:
Rename intel_dsi.c -> vlv_dsi.c
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/i915drm/intel_dsi.c
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/vlv_dsi.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.44 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.45
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.44 Sun Dec 19 00:26:41 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 00:57:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.44 2021/12/19 00:26:41 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.45 2021/12/19 00:57:42 riastradh Exp $
version 20180827
@@ -38,7 +38,7 @@ file external/bsd/drm2/i915drm/i915_modu
file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms
file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms
-file external/bsd/drm2/i915drm/intel_dsi.c i915drmkms
+file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms
file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
file external/bsd/drm2/i915drm/intelfb.c intelfb
# Generated from i915drmkms2netbsd.
Added files:
Index: src/sys/external/bsd/drm2/i915drm/vlv_dsi.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/vlv_dsi.c:1.1
--- /dev/null Sun Dec 19 00:57:42 2021
+++ src/sys/external/bsd/drm2/i915drm/vlv_dsi.c Sun Dec 19 00:57:42 2021
@@ -0,0 +1,40 @@
+/* $NetBSD: vlv_dsi.c,v 1.1 2021/12/19 00:57:42 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: vlv_dsi.c,v 1.1 2021/12/19 00:57:42 riastradh Exp $");
+
+#include "intel_drv.h"
+
+void
+vlv_dsi_init(struct drm_i915_private *dev_priv)
+{
+}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:57:42 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: vlv_dsi.c Removed Files: src/sys/external/bsd/drm2/i915drm: intel_dsi.c Log Message: Rename intel_dsi.c -> vlv_dsi.c To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/i915drm/intel_dsi.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/vlv_dsi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.c i915_sw_fence.h Log Message: Stub i915_sw_fence.c. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c \ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.43 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.44 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.43 Sun Dec 19 00:26:16 2021 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 00:26:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.43 2021/12/19 00:26:16 riastradh Exp $ +# $NetBSD: files.i915drmkms,v 1.44 2021/12/19 00:26:41 riastradh Exp $ version 20180827 @@ -36,6 +36,7 @@ makeoptions i915drmkms "CWARNFLAGS.int file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms file external/bsd/drm2/i915drm/i915_module.c i915drmkms file external/bsd/drm2/i915drm/i915_pci.c i915drmkms +file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms file external/bsd/drm2/i915drm/intel_dsi.c i915drmkms file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms @@ -189,7 +190,7 @@ file external/bsd/drm2/dist/drm/i915/i91 file external/bsd/drm2/dist/drm/i915/i915_scatterlist.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_scheduler.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_suspend.c i915drmkms -file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms +#file external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_sw_fence_work.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_switcheroo.c i915drmkms file external/bsd/drm2/dist/drm/i915/i915_syncmap.c i915drmkms Added files: Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c:1.1 --- /dev/null Sun Dec 19 00:26:41 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c Sun Dec 19 00:26:41 2021 @@ -0,0 +1,35 @@ +/* $NetBSD: i915_sw_fence.c,v 1.1 2021/12/19 00:26:41 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: i915_sw_fence.c,v 1.1 2021/12/19 00:26:41 riastradh Exp $"); + +#include "i915_sw_fence.h" Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.1 --- /dev/null Sun Dec 19 00:26:41 2021 +++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 00:26:41 2021 @@ -0,0 +1,61 @@ +/* $NetBSD: i915_sw_fence.h,v 1.1 2021/12/19 00:26:41 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:26:41 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Added Files: src/sys/external/bsd/drm2/i915drm: i915_sw_fence.c i915_sw_fence.h Log Message: Stub i915_sw_fence.c. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/i915drm/files.i915drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c \ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 00:25:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd
Log Message:
Break down and use gmake for i915drmkms2netbsd too.
Author: Maya Rashish
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd
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/i915drm/i915drmkms2netbsd
diff -u src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.2 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.3
--- src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd:1.2 Mon Aug 27 07:55:17 2018
+++ src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Sun Dec 19 00:25:19 2021
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: i915drmkms2netbsd,v 1.2 2018/08/27 07:55:17 riastradh Exp $
+# $NetBSD: i915drmkms2netbsd,v 1.3 2021/12/19 00:25:19 riastradh Exp $
#
# $ /path/to/i915drmkms2netbsd > /path/to/files.i915drmkms.new
#
@@ -8,16 +8,23 @@
set -Ceu
+: ${GMAKE:=gmake}
+
# Location of the i915drmkms sources relative to $NETBSDSRCDIR.
i915drmkms_top=external/bsd/drm2/dist/drm/i915
# config(5) flag for the i915drmkms driver.
i915drmkms_flag=i915drmkms
-env CONFIG_ACPI=y \
-env CONFIG_DRM_FBDEV_EMULATION=y \
-env src=. \
-make -f Makefile -V '$(i915-y)' \
+{
+ printf 'show-i915-y:\n'
+ printf '\t@echo $(i915-y)\n'
+ printf 'include Makefile\n'
+} | env \
+ env CONFIG_ACPI=y \
+ env CONFIG_DRM_FBDEV_EMULATION=y \
+ env src=. \
+ ${GMAKE} -f - -s show-i915-y \
| tr ' ' '\n' \
| grep -v '^$' \
| sed -e 's,\.o$,.c,' \
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Sun Dec 19 00:25:20 UTC 2021 Modified Files: src/sys/external/bsd/drm2/i915drm: i915drmkms2netbsd Log Message: Break down and use gmake for i915drmkms2netbsd too. Author: Maya Rashish To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/i915drmkms2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: rin
Date: Thu Aug 15 00:27:47 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/i915drm: intelfb.c
Log Message:
kern/52229
Correct linebytes (stride) for intelfb(4), which fixes screen
corruption on the following machines:
- MacBookAir5,2 (Ivy Bridge, 13-inch, Mid 2012)
- MacBookAir6,1 (Haswell, 11-inch, Early 2014)
Now, wsdisplay(4) console as well as intel(4) driver of Xorg
works fine on these machines.
Also there's no side effects found on another machine:
- ThinkPad T480s (Kaby Lake R)
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/i915drm/intelfb.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/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.16 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.17
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.16 Sat Dec 1 01:56:30 2018
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Thu Aug 15 00:27:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.16 2018/12/01 01:56:30 msaitoh Exp $ */
+/* $NetBSD: intelfb.c,v 1.17 2019/08/15 00:27:47 rin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.16 2018/12/01 01:56:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.17 2019/08/15 00:27:47 rin Exp $");
#include
#include
@@ -166,14 +166,12 @@ intelfb_attach_task(struct i915drmkms_ta
struct intelfb_softc *const sc = container_of(task,
struct intelfb_softc, sc_attach_task);
const struct intelfb_attach_args *const ifa = >sc_ifa;
- const struct drm_fb_helper_surface_size *const sizes = >ifa_fb_sizes;
const struct drmfb_attach_args da = {
.da_dev = sc->sc_dev,
.da_fb_helper = ifa->ifa_fb_helper,
.da_fb_sizes = >ifa_fb_sizes,
.da_fb_vaddr = bus_space_vaddr(ifa->ifa_fb_bst, sc->sc_fb_bsh),
- .da_fb_linebytes = roundup2((sizes->surface_width *
- howmany(sizes->surface_bpp, 8)), 64),
+ .da_fb_linebytes = ifa->ifa_fb_helper->fb->pitches[0],
.da_params = _drmfb_params,
};
int error;
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: rin Date: Thu Aug 15 00:27:47 UTC 2019 Modified Files: src/sys/external/bsd/drm2/i915drm: intelfb.c Log Message: kern/52229 Correct linebytes (stride) for intelfb(4), which fixes screen corruption on the following machines: - MacBookAir5,2 (Ivy Bridge, 13-inch, Mid 2012) - MacBookAir6,1 (Haswell, 11-inch, Early 2014) Now, wsdisplay(4) console as well as intel(4) driver of Xorg works fine on these machines. Also there's no side effects found on another machine: - ThinkPad T480s (Kaby Lake R) XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/i915drm/intelfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: kre Date: Sun Jan 27 05:00:48 UTC 2019 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Fix merge botch. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: kre Date: Sun Jan 27 05:00:48 UTC 2019 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Fix merge botch. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.36 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 Sun Jan 27 02:08:42 2019 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Jan 27 05:00:48 2019 @@ -1,6 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.35 2019/01/27 02:08:42 pgoyette Exp $ - -version 20180827 +# $NetBSD: files.i915drmkms,v 1.36 2019/01/27 05:00:48 kre Exp $ version 20180827
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: dholland
Date: Sat Jan 19 16:58:29 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
i915drmkms requires firmload. PR 53892
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.33 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.34
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.33 Fri Sep 21 11:27:13 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sat Jan 19 16:58:29 2019
@@ -1,9 +1,9 @@
-# $NetBSD: files.i915drmkms,v 1.33 2018/09/21 11:27:13 kamil Exp $
+# $NetBSD: files.i915drmkms,v 1.34 2019/01/19 16:58:29 dholland Exp $
version 20180827
define intelfbbus { }
-device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
+device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
attach i915drmkms at pci
device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: dholland Date: Sat Jan 19 16:58:29 UTC 2019 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: i915drmkms requires firmload. PR 53892 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: kamil Date: Fri Sep 21 11:27:13 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Appease GCC with a kernel sanitizer Add -Wno-maybe-uninitialized for intel_sprite.c that is a false positive. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: kamil
Date: Fri Sep 21 11:27:13 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Appease GCC with a kernel sanitizer
Add -Wno-maybe-uninitialized for intel_sprite.c that is a false positive.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.32 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.33
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.32 Mon Aug 27 16:06:01 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Fri Sep 21 11:27:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.32 2018/08/27 16:06:01 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.33 2018/09/21 11:27:13 kamil Exp $
version 20180827
@@ -22,6 +22,8 @@ makeoptions i915drmkms "CWARNFLAGS.i915d
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
+
file external/bsd/drm2/i915drm/i915_module.c i915drmkms
file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 16:15:23 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: intel_gtt.c Log Message: Convert to uintmax_t if we're going to use %jx. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/intel_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/i915drm/intel_gtt.c diff -u src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.10 src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.11 --- src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.10 Mon Aug 27 16:15:09 2018 +++ src/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 16:15:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_gtt.c,v 1.10 2018/08/27 16:15:09 riastradh Exp $ */ +/* $NetBSD: intel_gtt.c,v 1.11 2018/08/27 16:15:23 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Intel GTT stubs */ #include -__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.10 2018/08/27 16:15:09 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.11 2018/08/27 16:15:23 riastradh Exp $"); #include #include @@ -187,7 +187,7 @@ intel_gtt_insert_sg_entries(bus_dmamap_t } KASSERTMSG(len == 0, "segment length not divisible by PAGE_SIZE: %jx", - dmamap->dm_segs[seg].ds_len); + (uintmax_t)dmamap->dm_segs[seg].ds_len); } agp_i810_post_gtt_entry(isc, (va - PAGE_SIZE)); intel_gtt_chipset_flush();
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 16:15:23 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: intel_gtt.c Log Message: Convert to uintmax_t if we're going to use %jx. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/intel_gtt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 14:48:35 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: intel_gtt.c
Log Message:
Cope with multi-page segments.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/i915drm/intel_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/i915drm/intel_gtt.c
diff -u src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.8 src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.9
--- src/sys/external/bsd/drm2/i915drm/intel_gtt.c:1.8 Mon Aug 27 07:17:01 2018
+++ src/sys/external/bsd/drm2/i915drm/intel_gtt.c Mon Aug 27 14:48:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_gtt.c,v 1.8 2018/08/27 07:17:01 riastradh Exp $ */
+/* $NetBSD: intel_gtt.c,v 1.9 2018/08/27 14:48:35 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Intel GTT stubs */
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.8 2018/08/27 07:17:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gtt.c,v 1.9 2018/08/27 14:48:35 riastradh Exp $");
#include
#include
@@ -170,17 +170,24 @@ intel_gtt_insert_sg_entries(bus_dmamap_t
for (seg = 0; seg < dmamap->dm_nsegs; seg++) {
const bus_addr_t addr = dmamap->dm_segs[seg].ds_addr;
+ bus_size_t len;
- KASSERT(dmamap->dm_segs[seg].ds_len == PAGE_SIZE);
-
- /* XXX Respect flags. */
- error = agp_i810_write_gtt_entry(isc, va, addr, gtt_flags);
- if (error)
- device_printf(agp_i810_sc->as_dev,
- "write gtt entry"
- " %"PRIxMAX" -> %"PRIxMAX" failed: %d\n",
- (uintmax_t)va, (uintmax_t)(addr | 1), error);
- va += PAGE_SIZE;
+ for (len = dmamap->dm_segs[seg].ds_len;
+ len >= PAGE_SIZE;
+ len -= PAGE_SIZE, va += PAGE_SIZE) {
+ /* XXX Respect flags. */
+ error = agp_i810_write_gtt_entry(isc, va, addr,
+ gtt_flags);
+ if (error)
+device_printf(agp_i810_sc->as_dev,
+"write gtt entry"
+" %"PRIxMAX" -> %"PRIxMAX" failed: %d\n",
+(uintmax_t)va, (uintmax_t)(addr | 1),
+error);
+ }
+ KASSERTMSG(len == 0,
+ "segment length not divisible by PAGE_SIZE: %jx",
+ dmamap->dm_segs[seg].ds_len);
}
agp_i810_post_gtt_entry(isc, (va - PAGE_SIZE));
intel_gtt_chipset_flush();
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 14:48:35 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: intel_gtt.c Log Message: Cope with multi-page segments. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/i915drm/intel_gtt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 13:54:15 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Put override directory first in CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.29 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.30
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.29 Mon Aug 27 13:54:04 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Aug 27 13:54:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.29 2018/08/27 13:54:04 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.30 2018/08/27 13:54:15 riastradh Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -7,9 +7,10 @@ attach i915drmkms at pci
device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
attach intelfb at intelfbbus
-makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
+makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
+
makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 13:54:15 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Put override directory first in CPPFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 13:54:05 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Move CPPFLAGS to top, CWARNFLAGS below.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.28 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.29
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.28 Mon Aug 27 13:53:52 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Aug 27 13:54:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.28 2018/08/27 13:53:52 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.29 2018/08/27 13:54:04 riastradh Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -10,16 +10,15 @@ attach intelfb at intelfbbus
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
+makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
+makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
+makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
+
makeoptions i915drmkms "CWARNFLAGS.i915drmkms"+="-Wno-shadow"
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
-# XXX x86 kludge.
-makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
-makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
-makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
-
file external/bsd/drm2/i915drm/i915_module.c i915drmkms
file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 13:54:05 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Move CPPFLAGS to top, CWARNFLAGS below. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 13:53:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Omit commented warn flag, evidently needless.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.27 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.28
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.27 Mon Aug 27 13:35:15 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Aug 27 13:53:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.27 2018/08/27 13:35:15 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.28 2018/08/27 13:53:52 riastradh Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -14,7 +14,6 @@ makeoptions i915drmkms "CWARNFLAGS.i915d
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
-#makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="-Wno-conversion"
# XXX x86 kludge.
makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 13:53:52 UTC 2018 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Omit commented warn flag, evidently needless. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/i915drm/files.i915drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
