Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:50:31 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms vlv_dsi.c
src/sys/external/bsd/drm2/include/linux: radix-tree.h
Log Message:
i915: Odds & ends.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/vlv_dsi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/radix-tree.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.80 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.81
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.80 Sun Dec 19 11:49:46 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:50:31 2021
@@ -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.i915drm
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"
Index: src/sys/external/bsd/drm2/i915drm/vlv_dsi.c
diff -u src/sys/external/bsd/drm2/i915drm/vlv_dsi.c:1.2 src/sys/external/bsd/drm2/i915drm/vlv_dsi.c:1.3
--- src/sys/external/bsd/drm2/i915drm/vlv_dsi.c:1.2 Sun Dec 19 11:38:04 2021
+++ src/sys/external/bsd/drm2/i915drm/vlv_dsi.c Sun Dec 19 11:50:31 2021
@@ -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 @@ void
vlv_dsi_init(struct drm_i915_private *dev_priv)
{
}
+
+bool
+bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv)
+{
+ return 0;
+}
Index: src/sys/external/bsd/drm2/include/linux/radix-tree.h
diff -u src/sys/external/bsd/drm2/include/linux/radix-tree.h:1.5 src/sys/external/bsd/drm2/include/linux/radix-tree.h:1.6
--- src/sys/external/bsd/drm2/include/linux/radix-tree.h:1.5 Sun Dec 19 11:33:31 2021
+++ src/sys/external/bsd/drm2/include/linux/radix-tree.h Sun Dec 19 11:50:31 2021
@@ -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
