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>

diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index dbf0d6f43fa98b958d678b1131ae1b68abe2259e..6c34272a13fd64d8bf0a3904efb4f48a57456a72 100644 (file)
--- 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 */