Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:15:41 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt: gen8_ppgtt.c
Log Message:
i915: Fix up #ifdef around sg dma iteration.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/gen8_ppgtt.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/gen8_ppgtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/gen8_ppgtt.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/gt/gen8_ppgtt.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/gen8_ppgtt.c:1.5 Sun Dec 19 11:15:18 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/gen8_ppgtt.c Sun Dec 19 11:15:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gen8_ppgtt.c,v 1.5 2021/12/19 11:15:18 riastradh Exp $ */
+/* $NetBSD: gen8_ppgtt.c,v 1.6 2021/12/19 11:15:41 riastradh Exp $ */
// SPDX-License-Identifier: MIT
/*
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gen8_ppgtt.c,v 1.5 2021/12/19 11:15:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gen8_ppgtt.c,v 1.6 2021/12/19 11:15:41 riastradh Exp $");
#include <linux/log2.h>
@@ -506,10 +506,13 @@ static void gen8_ppgtt_insert_huge(struc
#ifdef __NetBSD__
GEM_BUG_ON((iter->map->dm_segs[iter->seg].ds_len -
iter->off) < page_size);
+ vaddr[index++] = encode |
+ (iter->map->dm_segs[iter->seg].ds_addr
+ + iter->off);
#else
GEM_BUG_ON(iter->sg->length < page_size);
-#endif
vaddr[index++] = encode | iter->dma;
+#endif
start += page_size;
#ifdef __NetBSD__
