[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gem i915: Disable partia...

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

details:   https://anonhg.NetBSD.org/src/rev/bc29b9331b11
branches:  trunk
changeset: 1028825:bc29b9331b11
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:09:01 2021 +0000

description:
i915: Disable partial views on objects for now.

Needs some logic in i915_get_gtt_vma_pages to be wired up.

diffstat:

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

diffs (36 lines):

diff -r 434f93480ac6 -r bc29b9331b11 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c   Sun Dec 19 12:08:54 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c   Sun Dec 19 12:09:01 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_mman.c,v 1.17 2021/12/19 12:08:46 riastradh Exp $     */
+/*     $NetBSD: i915_gem_mman.c,v 1.18 2021/12/19 12:09:01 riastradh Exp $     */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.17 2021/12/19 12:08:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.18 2021/12/19 12:09:01 riastradh Exp $");
 
 #include <linux/anon_inodes.h>
 #include <linux/mman.h>
@@ -434,6 +434,9 @@
                                       PIN_MAPPABLE |
                                       PIN_NONBLOCK /* NOWARN */ |
                                       PIN_NOEVICT);
+#ifdef __NetBSD__              /* XXX i915 partial views */
+       (void)compute_partial_view;
+#else
        if (IS_ERR(vma)) {
                /* Use a partial view if it is bigger than available space */
                struct i915_ggtt_view view =
@@ -459,6 +462,7 @@
                /* The entire mappable GGTT is pinned? Unexpected! */
                GEM_BUG_ON(vma == ERR_PTR(-ENOSPC));
        }
+#endif
        if (IS_ERR(vma)) {
                ret = PTR_ERR(vma);
                goto err_reset;