[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gt i915: Fix constificat...

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

details:   https://anonhg.NetBSD.org/src/rev/60038af7c4e5
branches:  trunk
changeset: 1028524:60038af7c4e5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:14:48 2021 +0000

description:
i915: Fix constification in px_base macro.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 4af8b44a0d02 -r 60038af7c4e5 sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h        Sun Dec 19 11:14:42 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h        Sun Dec 19 11:14:48 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_gtt.h,v 1.6 2021/12/19 11:12:13 riastradh Exp $  */
+/*     $NetBSD: intel_gtt.h,v 1.7 2021/12/19 11:14:48 riastradh Exp $  */
 
 /* SPDX-License-Identifier: MIT */
 /*
@@ -181,14 +181,14 @@
        __builtin_choose_expr( \
        __builtin_types_compatible_p(typeof(x), type) || \
        __builtin_types_compatible_p(typeof(x), const type), \
-       ({ type __x = (type)(x); expr; }), \
+       ({ type __x = (type)__UNCONST(x); expr; }), \
        other)
 
 #define px_base(px) \
-       __px_choose_expr(px, const struct i915_page_dma *, __x, \
-       __px_choose_expr(px, const struct i915_page_scratch *, &__x->base, \
-       __px_choose_expr(px, const struct i915_page_table *, &__x->base, \
-       __px_choose_expr(px, const struct i915_page_directory *, &__x->pt.base, \
+       __px_choose_expr(px, struct i915_page_dma *, __x, \
+       __px_choose_expr(px, struct i915_page_scratch *, &__x->base, \
+       __px_choose_expr(px, struct i915_page_table *, &__x->base, \
+       __px_choose_expr(px, struct i915_page_directory *, &__x->pt.base, \
        (void)0))))
 #ifdef __NetBSD__
 #define px_dma(px) (px_base(px)->map->dm_segs[0].ds_addr)