Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:14:48 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_gtt.h
Log Message:
i915: Fix constification in px_base macro.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.6 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h:1.6 Sun Dec 19 11:12:13 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_gtt.h Sun Dec 19 11:14:48 2021
@@ -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)
