summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDanylo Piliaiev <dpiliaiev@igalia.com>2023-03-26 09:38:13 -0700
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>2023-04-06 20:29:39 +0300
commitf1af066bcfd38daa9eee7195ef772dadaaa18520 (patch)
treef81b0e6ba0368fcddff8304bff3b656fd0493408 /include
parent45d96836978701f7e507ddc0f6cfc5e6d5c33d01 (diff)
downloadlwn-f1af066bcfd38daa9eee7195ef772dadaaa18520.tar.gz
lwn-f1af066bcfd38daa9eee7195ef772dadaaa18520.zip
drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code
Clashes with C++ `or` keyword Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com> Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/528751/ Link: https://lore.kernel.org/r/20230326163813.535762-1-robdclark@gmail.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/drm/msm_drm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index dbf0d6f43fa9..6c34272a13fd 100644
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -186,7 +186,11 @@ struct drm_msm_gem_cpu_fini {
*/
struct drm_msm_gem_submit_reloc {
__u32 submit_offset; /* in, offset from submit_bo */
+#ifdef __cplusplus
+ __u32 _or; /* in, value OR'd with result */
+#else
__u32 or; /* in, value OR'd with result */
+#endif
__s32 shift; /* in, amount of left shift (can be negative) */
__u32 reloc_idx; /* in, index of reloc_bo buffer */
__u64 reloc_offset; /* in, offset from start of reloc_bo */