geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdrm: add msm drm uapi header 

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.

v2: Remove private freedreno/msm/msm_drm.h
v3: meson.build update
v3: README update (by anholt)

Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
main
Tanmay Shah 2018-08-13 17:29:21 -07:00 committed by Eric Anholt
parent f31fd57c60
commit f0c642e8df
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.sources
View File

@ -25,6 +25,7 @@ LIBDRM_INCLUDE_H_FILES := \
include/drm/i915_drm.h \ include/drm/i915_drm.h \
include/drm/mach64_drm.h \ include/drm/mach64_drm.h \
include/drm/mga_drm.h \ include/drm/mga_drm.h \
include/drm/msm_drm.h \
include/drm/nouveau_drm.h \ include/drm/nouveau_drm.h \
include/drm/qxl_drm.h \ include/drm/qxl_drm.h \
include/drm/r128_drm.h \ include/drm/r128_drm.h \

1
freedreno/Makefile.sources
View File

@ -7,7 +7,6 @@ LIBDRM_FREEDRENO_FILES := \
freedreno_bo_cache.c \ freedreno_bo_cache.c \
msm/msm_bo.c \ msm/msm_bo.c \
msm/msm_device.c \ msm/msm_device.c \
msm/msm_drm.h \
msm/msm_pipe.c \ msm/msm_pipe.c \
msm/msm_priv.h \ msm/msm_priv.h \
msm/msm_ringbuffer.c msm/msm_ringbuffer.c

5
include/drm/README
View File

@ -122,11 +122,6 @@ omap_drm.h (living in $TOP/omap)
- License mismatch, missing DRM_IOCTL_OMAP_GEM_NEW and related struct - License mismatch, missing DRM_IOCTL_OMAP_GEM_NEW and related struct
Status: ? Status: ?
msm_drm.h (located in $TOP/freedreno/msm/)
- License mismatch, missing MSM_PIPE_*, MSM_SUBMIT_*. Renamed
drm_msm_gem_submit::flags, missing drm_msm_gem_submit::fence_fd.
Status: ?
exynos_drm.h (living in $TOP/exynos) exynos_drm.h (living in $TOP/exynos)
- License mismatch, now using fixed size ints (but not everywhere). Lots of - License mismatch, now using fixed size ints (but not everywhere). Lots of
new stuff. new stuff.

3
freedreno/msm/msm_drm.h → include/drm/msm_drm.h
View File

@ -25,7 +25,6 @@
#ifndef __MSM_DRM_H__ #ifndef __MSM_DRM_H__
#define __MSM_DRM_H__ #define __MSM_DRM_H__
#include <stddef.h>
#include "drm.h" #include "drm.h"
#if defined(__cplusplus) #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_NO_IMPLICIT 0x80000000 /* disable implicit sync */
#define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */ #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_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */
#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */
#define MSM_SUBMIT_FLAGS ( \ #define MSM_SUBMIT_FLAGS ( \
MSM_SUBMIT_NO_IMPLICIT | \ MSM_SUBMIT_NO_IMPLICIT | \
MSM_SUBMIT_FENCE_FD_IN | \ MSM_SUBMIT_FENCE_FD_IN | \
MSM_SUBMIT_FENCE_FD_OUT | \ MSM_SUBMIT_FENCE_FD_OUT | \
MSM_SUBMIT_SUDO | \
0) 0)
/* Each cmdstream submit consists of a table of buffers involved, and /* Each cmdstream submit consists of a table of buffers involved, and

9
meson.build
View File

@ -303,10 +303,11 @@ install_headers(
'include/drm/drm.h', 'include/drm/drm_fourcc.h', 'include/drm/drm_mode.h', '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/drm_sarea.h', 'include/drm/i915_drm.h',
'include/drm/mach64_drm.h', 'include/drm/mga_drm.h', 'include/drm/mach64_drm.h', 'include/drm/mga_drm.h',
'include/drm/nouveau_drm.h', 'include/drm/qxl_drm.h', 'include/drm/msm_drm.h', 'include/drm/nouveau_drm.h',
'include/drm/r128_drm.h', 'include/drm/radeon_drm.h', 'include/drm/qxl_drm.h', 'include/drm/r128_drm.h',
'include/drm/amdgpu_drm.h', 'include/drm/savage_drm.h', 'include/drm/radeon_drm.h', 'include/drm/amdgpu_drm.h',
'include/drm/sis_drm.h', 'include/drm/tegra_drm.h', 'include/drm/vc4_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', 'include/drm/via_drm.h', 'include/drm/virtgpu_drm.h',
subdir : 'libdrm', subdir : 'libdrm',
) )