msm_drm.h file derived from drm-next kernel uapi header.
Remove freedreno/msm/msm_drm.h to maintain only one copy of msm_drm.h and change freedreno Makefile accordingly.
Signed-off-by: Tanmay Shah tanmay@codeaurora.org --- Makefile.sources | 1 + freedreno/Makefile.sources | 1 - {freedreno/msm => include/drm}/msm_drm.h | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename {freedreno/msm => include/drm}/msm_drm.h (99%)
diff --git a/Makefile.sources b/Makefile.sources index 1f8372bc..55290fe9 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -25,6 +25,7 @@ LIBDRM_INCLUDE_H_FILES := \ include/drm/i915_drm.h \ include/drm/mach64_drm.h \ include/drm/mga_drm.h \ + include/drm/msm_drm.h \ include/drm/nouveau_drm.h \ include/drm/qxl_drm.h \ include/drm/r128_drm.h \ diff --git a/freedreno/Makefile.sources b/freedreno/Makefile.sources index 68a679bf..ca89511a 100644 --- a/freedreno/Makefile.sources +++ b/freedreno/Makefile.sources @@ -7,7 +7,6 @@ LIBDRM_FREEDRENO_FILES := \ freedreno_bo_cache.c \ msm/msm_bo.c \ msm/msm_device.c \ - msm/msm_drm.h \ msm/msm_pipe.c \ msm/msm_priv.h \ msm/msm_ringbuffer.c diff --git a/freedreno/msm/msm_drm.h b/include/drm/msm_drm.h similarity index 99% rename from freedreno/msm/msm_drm.h rename to include/drm/msm_drm.h index dac49e59..c06d0a5b 100644 --- a/freedreno/msm/msm_drm.h +++ b/include/drm/msm_drm.h @@ -25,7 +25,6 @@ #ifndef __MSM_DRM_H__ #define __MSM_DRM_H__
-#include <stddef.h> #include "drm.h"
#if defined(__cplusplus) @@ -202,10 +201,12 @@ struct drm_msm_gem_submit_bo { #define MSM_SUBMIT_NO_IMPLICIT 0x80000000 /* disable implicit sync */ #define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */ #define MSM_SUBMIT_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */ +#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */ #define MSM_SUBMIT_FLAGS ( \ MSM_SUBMIT_NO_IMPLICIT | \ MSM_SUBMIT_FENCE_FD_IN | \ MSM_SUBMIT_FENCE_FD_OUT | \ + MSM_SUBMIT_SUDO | \ 0)
/* Each cmdstream submit consists of a table of buffers involved, and