[src/trunk]: src/sys/external/bsd/drm2 i915: Odds & ends.

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

details:   https://anonhg.NetBSD.org/src/rev/699080f7c457
branches:  trunk
changeset: 1028714:699080f7c457
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:50:31 2021 +0000

description:
i915: Odds & ends.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms   |   4 ++--
 sys/external/bsd/drm2/i915drm/vlv_dsi.c          |  10 ++++++++--
 sys/external/bsd/drm2/include/linux/radix-tree.h |   3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 9c9691d6d14d -r 699080f7c457 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:50:24 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:50:31 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.80 2021/12/19 11:49:46 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.81 2021/12/19 11:50:31 riastradh Exp $
 
 version        20180827
 
@@ -33,7 +33,7 @@
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500" # milliseconds
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_STOP_TIMEOUT=100" # milliseconds
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_PREEMPT_TIMEOUT=640" # milliseconds
-makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_CAPTURE_ERROR=1"
+makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_CAPTURE_ERROR=0"
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_I915_SELFTEST=0"
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_PM=1"
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-DCONFIG_INTEL_MEI_HDCP=0"
diff -r 9c9691d6d14d -r 699080f7c457 sys/external/bsd/drm2/i915drm/vlv_dsi.c
--- a/sys/external/bsd/drm2/i915drm/vlv_dsi.c   Sun Dec 19 11:50:24 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/vlv_dsi.c   Sun Dec 19 11:50:31 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vlv_dsi.c,v 1.2 2021/12/19 11:38:04 riastradh Exp $    */
+/*     $NetBSD: vlv_dsi.c,v 1.3 2021/12/19 11:50:31 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vlv_dsi.c,v 1.2 2021/12/19 11:38:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlv_dsi.c,v 1.3 2021/12/19 11:50:31 riastradh Exp $");
 
 #include "display/intel_dsi.h"
 
@@ -38,3 +38,9 @@
 vlv_dsi_init(struct drm_i915_private *dev_priv)
 {
 }
+
+bool
+bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv)
+{
+       return 0;
+}
diff -r 9c9691d6d14d -r 699080f7c457 sys/external/bsd/drm2/include/linux/radix-tree.h
--- a/sys/external/bsd/drm2/include/linux/radix-tree.h  Sun Dec 19 11:50:24 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/radix-tree.h  Sun Dec 19 11:50:31 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radix-tree.h,v 1.5 2021/12/19 11:33:31 riastradh Exp $ */
+/*     $NetBSD: radix-tree.h,v 1.6 2021/12/19 11:50:31 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
 #define        radix_tree_empty                linux_radix_tree_empty
 #define        radix_tree_exception            linux_radix_tree_exception
 #define        radix_tree_insert               linux_radix_tree_insert
+#define        radix_tree_iter_delete          linux_radix_tree_iter_delete
 #define        radix_tree_iter_init            linux_radix_tree_iter_init
 #define        radix_tree_lookup               linux_radix_tree_lookup
 #define        radix_tree_next_chunk           linux_radix_tree_next_chunk