Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:40:28 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c intel_guc_loader.c
Log Message:
Don't forget to set .uio_offset and to call UIO_SETUP_SYSSPACE.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.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_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.46 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.47
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.46 Mon Aug 27 07:45:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Mon Aug 27 13:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.c,v 1.46 2018/08/27 07:45:55 riastradh Exp $ */
+/* $NetBSD: i915_gem.c,v 1.47 2018/08/27 13:40:28 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.46 2018/08/27 07:45:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.47 2018/08/27 13:40:28 riastradh Exp $");
#ifdef __NetBSD__
#if 0 /* XXX uvmhist option? */
@@ -5845,6 +5845,7 @@ i915_gem_object_create_from_data(struct
struct uio uio = {
.uio_iov = &iov,
.uio_iovcnt = 1,
+ .uio_offset = 0,
.uio_resid = size,
.uio_rw = UIO_WRITE,
};
@@ -5868,6 +5869,7 @@ i915_gem_object_create_from_data(struct
i915_gem_object_pin_pages(obj);
#ifdef __NetBSD__
+ UIO_SETUP_SYSSPACE(&uio);
/* XXX errno NetBSD->Linux */
ret = -ubc_uiomove(obj->base.filp, &uio, size, UVM_ADV_NORMAL,
UBC_WRITE);
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.6 Mon Aug 27 07:22:59 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c Mon Aug 27 13:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_guc_loader.c,v 1.6 2018/08/27 07:22:59 riastradh Exp $ */
+/* $NetBSD: intel_guc_loader.c,v 1.7 2018/08/27 13:40:28 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -29,7 +29,7 @@
* Alex Dai <[email protected]>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.6 2018/08/27 07:22:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.7 2018/08/27 13:40:28 riastradh Exp $");
#include <linux/firmware.h>
#include <linux/module.h>
@@ -262,8 +262,10 @@ static int guc_ucode_xfer_dma(struct drm
iov.iov_len = UOS_RSA_SIG_SIZE;
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
+ uio.uio_offset = 0;
uio.uio_resid = UOS_RSA_SIG_SIZE;
uio.uio_rw = UIO_READ;
+ UIO_SETUP_SYSSPACE(&uio);
/* XXX errno NetBSD->Linux */
ret = -ubc_uiomove(fw_obj->base.filp, &uio, UOS_RSA_SIG_SIZE,
UVM_ADV_NORMAL, UBC_READ);
