summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2021-12-19 11:50:31 +0000
committerriastradh <riastradh@NetBSD.org>2021-12-19 11:50:31 +0000
commit8e2ee24c5fda04ed37ee27ca79a1467fbf354c8a (patch)
tree40e1a71cc6002024375418109cfdba0496ce5f3a /sys/external
parent10de6572a38043fcfdbed06b84582fffddf64d45 (diff)
i915: Odds & ends.
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/drm2/i915drm/files.i915drmkms4
-rw-r--r--sys/external/bsd/drm2/i915drm/vlv_dsi.c10
-rw-r--r--sys/external/bsd/drm2/include/linux/radix-tree.h3
3 files changed, 12 insertions, 5 deletions
diff --git a/sys/external/bsd/drm2/i915drm/files.i915drmkms b/sys/external/bsd/drm2/i915drm/files.i915drmkms
index 234b00ddbe8..376556b5e2c 100644
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms
@@ -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_SW_FENCE_CHECK_
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 --git a/sys/external/bsd/drm2/i915drm/vlv_dsi.c b/sys/external/bsd/drm2/i915drm/vlv_dsi.c
index 1c3ef182cd6..572654ff3d2 100644
--- a/sys/external/bsd/drm2/i915drm/vlv_dsi.c
+++ b/sys/external/bsd/drm2/i915drm/vlv_dsi.c
@@ -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;
+}
diff --git a/sys/external/bsd/drm2/include/linux/radix-tree.h b/sys/external/bsd/drm2/include/linux/radix-tree.h
index c6925828e29..4d862e05844 100644
--- a/sys/external/bsd/drm2/include/linux/radix-tree.h
+++ b/sys/external/bsd/drm2/include/linux/radix-tree.h
@@ -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