Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:45:31 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c
Log Message:
For reasons beyond me, map does size/offset but unmap does start/end.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.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_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.12 Mon Aug 27 14:44:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c Mon Aug 27 14:45:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_cmd_parser.c,v 1.12 2018/08/27 14:44:30 riastradh Exp $ */
+/* $NetBSD: i915_cmd_parser.c,v 1.13 2018/08/27 14:45:31 riastradh Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.12 2018/08/27 14:44:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.13 2018/08/27 14:45:31 riastradh Exp $");
#include "i915_drv.h"
@@ -982,7 +982,7 @@ static u32 *copy_batch(struct drm_i915_g
unmap_src:
#ifdef __NetBSD__
- uvm_unmap(kernel_map, srcva, srclen);
+ uvm_unmap(kernel_map, srcva, srcva + srclen);
#else
vunmap(src_base);
#endif
@@ -1239,7 +1239,7 @@ int i915_parse_cmds(struct intel_engine_
#ifdef __NetBSD__
uvm_unmap(kernel_map, (vaddr_t)batch_base,
- roundup(batch_len, PAGE_SIZE));
+ (vaddr_t)batch_base + roundup(batch_len, PAGE_SIZE));
#else
vunmap(batch_base);
#endif
