[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Restore i915_gem.c...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b35ff9c8b808
branches:  trunk
changeset: 1028895:b35ff9c8b808
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:25:27 2021 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r c6c090ffd311 -r b35ff9c8b808 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Dec 19 12:25:20 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Sun Dec 19 12:25:27 2021 +0000
@@ -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 @@
             bool needs_clflush_before,
             bool needs_clflush_after)
 {
-#ifdef __NetBSD__
-       return -EFAULT;
-#else
        char *vaddr;
        int ret;
 
@@ -770,7 +767,6 @@
        kunmap(page);
 
        return ret ? -EFAULT : 0;
-#endif
 }
 
 static int