Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:40:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_memcpy.c
Log Message:
No need to port this until we deal with movntdqa (and kernel FPU use).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_memcpy.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/dist/drm/i915/i915_memcpy.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_memcpy.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_memcpy.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_memcpy.c:1.2 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_memcpy.c Sun Dec 19 01:40:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_memcpy.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $ */
+/* $NetBSD: i915_memcpy.c,v 1.3 2021/12/19 01:40:41 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_memcpy.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_memcpy.c,v 1.3 2021/12/19 01:40:41 riastradh Exp $");
#include <linux/kernel.h>
#include <asm/fpu/api.h>
@@ -168,6 +168,7 @@ void i915_unaligned_memcpy_from_wc(void
void i915_memcpy_init_early(struct drm_i915_private *dev_priv)
{
+#ifdef CONFIG_AS_MOVNTDQA
/*
* Some hypervisors (e.g. KVM) don't support VEX-prefix instructions
* emulation. So don't enable movntdqa in hypervisor guest.
@@ -175,4 +176,5 @@ void i915_memcpy_init_early(struct drm_i
if (static_cpu_has(X86_FEATURE_XMM4_1) &&
!boot_cpu_has(X86_FEATURE_HYPERVISOR))
static_branch_enable(&has_movntdqa);
+#endif
}
