Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gem drm/i915: Forgot i91...



details:   https://anonhg.NetBSD.org/src/rev/4aaf888db741
branches:  trunk
changeset: 1028616:4aaf888db741
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:27:27 2021 +0000

description:
drm/i915: Forgot i915_gem_object_types.h change for rb->array.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_types.h |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 28cddcbe531e -r 4aaf888db741 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_types.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_types.h   Sun Dec 19 11:27:20 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object_types.h   Sun Dec 19 11:27:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_object_types.h,v 1.3 2021/12/19 01:38:51 riastradh Exp $      */
+/*     $NetBSD: i915_gem_object_types.h,v 1.4 2021/12/19 11:27:27 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -70,6 +70,7 @@
        I915_MMAP_TYPE_WC,
        I915_MMAP_TYPE_WB,
        I915_MMAP_TYPE_UC,
+       I915_MMAP_NTYPES
 };
 
 struct i915_mmap_offset {
@@ -137,7 +138,11 @@
 
        struct {
                spinlock_t lock; /* Protects access to mmo offsets */
+#ifdef __NetBSD__
+               struct i915_mmap_offset *offsets[I915_MMAP_NTYPES];
+#else
                struct rb_root offsets;
+#endif
        } mmo;
 
        I915_SELFTEST_DECLARE(struct list_head st_link);



Home | Main Index | Thread Index | Old Index