Module Name: src
Committed By: riastradh
Date: Mon Aug 27 13:43:01 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_guc_loader.c
Log Message:
Remove temporary diagnostic now that I know I forgot uio_offset.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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/intel_guc_loader.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c:1.10 Mon Aug 27 13:42:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c Mon Aug 27 13:43:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_guc_loader.c,v 1.10 2018/08/27 13:42:35 riastradh Exp $ */
+/* $NetBSD: intel_guc_loader.c,v 1.11 2018/08/27 13:43:01 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.10 2018/08/27 13:42:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.11 2018/08/27 13:43:01 riastradh Exp $");
#include <linux/firmware.h>
#include <linux/module.h>
@@ -539,36 +539,6 @@ static void guc_fw_fetch(struct drm_devi
goto fail;
}
-#ifdef __NetBSD__ /* XXX temporary diagnostic kludge */
- {
- void *buf = kmem_alloc(fw->size, KM_SLEEP);
- struct iovec iov;
- struct uio uio;
- iov.iov_base = buf;
- iov.iov_len = fw->size;
- uio.uio_iov = &iov;
- uio.uio_iovcnt = 1;
- uio.uio_offset = 0;
- uio.uio_resid = fw->size;
- uio.uio_rw = UIO_READ;
- UIO_SETUP_SYSSPACE(&uio);
- err = -ubc_uiomove(obj->base.filp, &uio, fw->size,
- UVM_ADV_NORMAL, UBC_READ);
- if (err) {
- DRM_DEBUG_DRIVER("ubc_uiomove failed for test: %d\n",
- err);
- kmem_free(buf, fw->size);
- goto fail;
- }
- if (memcmp(fw->data, buf, fw->size) != 0) {
- DRM_DEBUG_DRIVER("firmware copy corrupted\n");
- kmem_free(buf, fw->size);
- goto fail;
- }
- kmem_free(buf, fw->size);
- }
-#endif
-
guc_fw->guc_fw_obj = obj;
guc_fw->guc_fw_size = fw->size;
