summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2021-12-19 11:14:48 +0000
committerriastradh <riastradh@NetBSD.org>2021-12-19 11:14:48 +0000
commitbbd0f4fafc4b28508d6534e0e63a4d2eb93ea6d2 (patch)
tree9941b663e00f6a5d89fe6b3e65118b0eb99fcae2 /sys
parentb74870747db47d790594a64e3e1ea5c233b3d924 (diff)
i915: Fix constification in px_base macro.
Diffstat (limited to 'sys')
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
index b1cddcfb842..caf2b1215db 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
@@ -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 @@ struct i915_page_directory {
__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)