public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code
@ 2023-03-26 16:38 Rob Clark
  2023-03-26 22:01 ` Dmitry Baryshkov
  2023-03-28 22:38 ` Dmitry Baryshkov
  0 siblings, 2 replies; 3+ messages in thread
From: Rob Clark @ 2023-03-26 16:38 UTC (permalink / raw)
  To: dri-devel
  Cc: freedreno, linux-arm-msm, Danylo Piliaiev, Rob Clark, Rob Clark,
	Abhinav Kumar, Dmitry Baryshkov, Sean Paul, David Airlie,
	Daniel Vetter, open list

From: Danylo Piliaiev <dpiliaiev@igalia.com>

Clashes with C++ `or` keyword

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
This is a port of a C++ compat fix that was made in mesa's copy of the
drm uapi headers.

 include/uapi/drm/msm_drm.h | 4 ++++
 1 file changed, 4 insertions(+)

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 */
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-28 22:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-26 16:38 [PATCH] drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code Rob Clark
2023-03-26 22:01 ` Dmitry Baryshkov
2023-03-28 22:38 ` Dmitry Baryshkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox