Commit f1af066b authored by Danylo Piliaiev's avatar Danylo Piliaiev Committed by Dmitry Baryshkov
Browse files

drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code 



Clashes with C++ `or` keyword

Signed-off-by: default avatarDanylo Piliaiev <dpiliaiev@igalia.com>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry 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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 45d96836

include/uapi/drm/msm_drm.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */