Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:25:27 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
i915: Restore i915_gem.c shmem_pwrite.
This was ifdef'd out back when it was a fast path shmem_pwrite_fast
using __copy_in_user_inatomic, but the ifdef got merged anyway into a
different function that is not a fast path.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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.70 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.71
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.70 Sun Dec 19 11:26:35 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Sun Dec 19 12:25:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.c,v 1.70 2021/12/19 11:26:35 riastradh Exp $ */
+/* $NetBSD: i915_gem.c,v 1.71 2021/12/19 12:25:27 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.70 2021/12/19 11:26:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.71 2021/12/19 12:25:27 riastradh Exp $");
#ifdef __NetBSD__
#if 0 /* XXX uvmhist option? */
@@ -752,9 +752,6 @@ shmem_pwrite(struct page *page, int offs
bool needs_clflush_before,
bool needs_clflush_after)
{
-#ifdef __NetBSD__
- return -EFAULT;
-#else
char *vaddr;
int ret;
@@ -770,7 +767,6 @@ shmem_pwrite(struct page *page, int offs
kunmap(page);
return ret ? -EFAULT : 0;
-#endif
}
static int
