Module Name: src Committed By: riastradh Date: Sun Dec 19 11:50:40 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_ggtt.c Log Message: i915: Ifdef out stash_init use just like def To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.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/gt/intel_ggtt.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c:1.7 Sun Dec 19 11:39:55 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_ggtt.c Sun Dec 19 11:50:39 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_ggtt.c,v 1.7 2021/12/19 11:39:55 riastradh Exp $ */ +/* $NetBSD: intel_ggtt.c,v 1.8 2021/12/19 11:50:39 riastradh Exp $ */ // SPDX-License-Identifier: MIT /* @@ -6,7 +6,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_ggtt.c,v 1.7 2021/12/19 11:39:55 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_ggtt.c,v 1.8 2021/12/19 11:50:39 riastradh Exp $"); #include <linux/stop_machine.h> @@ -100,7 +100,9 @@ int i915_ggtt_init_hw(struct drm_i915_pr { int ret; +#ifndef __NetBSD__ stash_init(&i915->mm.wc_stash); +#endif /* * Note that we use page colouring to enforce a guard page at the