On 2018-07-25 17:56, Rob Clark wrote:
On Wed, Jul 25, 2018 at 8:43 PM, Tanmay Shah tanmay@codeaurora.org wrote:
On 2018-07-25 17:33, Tanmay Shah wrote:
On 2018-07-24 15:21, Eric Anholt wrote:
Tanmay Shah tanmay@codeaurora.org writes:
On 2018-07-24 12:19, Eric Anholt wrote:
Tanmay Shah tanmay@codeaurora.org writes:
> file derived from msm-next kernel uapi header.
Unless there's an exception from Dave, I believe uapi headers in libdrm and Mesa should be direct copies from "make headers_install" on the drm-next branch. How does this compare to that?
The header file is identical as in drm-next kernel.
Great, let's say "drm-next" instead to make that clear. Also, looks like freedreno/msm/msm_drm.h should probably get removed in favor of this?
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
+Rob Clark
Thanks Eric, I will send v2 with suggested changes.
freedreno/msm/msm_drm.h is owned by Rob, I am not sure if we need it there or not. I would let Rob comment on this.
We require msm_drm.h in include/drm/ directory to export GEM ioctls so other modules such as gbm can use it. Other platforms have similar strategy.
Sorry, Actually +Rob Clark
yeah, we should remove the duplicate header in libdrm.. so far it hasn't been exported outside of libdrm_freedreno since it was unneeded.. but as long as libdrm_freedreno still compiles properly with the moved header, I'm fine with it. There might be some include path tweaking required, not sure..
(and PS. "ownership" is not a thing upstream.. if it lives in the same git tree and changing it doesn't break the build, it is not off-limits ;-))
BR, -R
Thanks, Rob.
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
Tanmay Shah tanmay@codeaurora.org writes:
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
Looks like this is missing the meson.build update, and leaves a stale note in include/drm/README.
msm_drm.h file Generated using make headers_install.
Generated from tree - git://people.freedesktop.org/~airlied/linux branch - drm-next commit - 6d08b06e67cd117f6992c46611dfb4ce267cd71e
Remove freedreno/msm/msm_drm.h to maintain only one copy of msm_drm.h and change freedreno Makefile and meson.build file accordingly.
Signed-off-by: Tanmay Shah tanmay@codeaurora.org --- Makefile.sources | 1 + freedreno/Makefile.sources | 1 - {freedreno/msm => include/drm}/msm_drm.h | 3 ++- meson.build | 9 +++++---- 4 files changed, 8 insertions(+), 6 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 diff --git a/meson.build b/meson.build index b2f9a290..56d1f151 100644 --- a/meson.build +++ b/meson.build @@ -303,10 +303,11 @@ install_headers( 'include/drm/drm.h', 'include/drm/drm_fourcc.h', 'include/drm/drm_mode.h', 'include/drm/drm_sarea.h', 'include/drm/i915_drm.h', 'include/drm/mach64_drm.h', 'include/drm/mga_drm.h', - 'include/drm/nouveau_drm.h', 'include/drm/qxl_drm.h', - 'include/drm/r128_drm.h', 'include/drm/radeon_drm.h', - 'include/drm/amdgpu_drm.h', 'include/drm/savage_drm.h', - 'include/drm/sis_drm.h', 'include/drm/tegra_drm.h', 'include/drm/vc4_drm.h', + 'include/drm/msm_drm.h', 'include/drm/nouveau_drm.h', + 'include/drm/qxl_drm.h', 'include/drm/r128_drm.h', + 'include/drm/radeon_drm.h', 'include/drm/amdgpu_drm.h', + 'include/drm/savage_drm.h', 'include/drm/sis_drm.h', + 'include/drm/tegra_drm.h', 'include/drm/vc4_drm.h', 'include/drm/via_drm.h', 'include/drm/virtgpu_drm.h', subdir : 'libdrm', )
dri-devel@lists.freedesktop.org
-
Eric Anholt -
Tanmay Shah