summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanmay Shah <tanmay@codeaurora.org>2018-08-13 17:29:21 -0700
committerEric Anholt <eric@anholt.net>2018-08-23 08:48:45 -0700
commitf0c642e8df414ffc50321505c6b9acb9ba9fd4e5 (patch)
treeadb42d880d83712d3f843a9af81cdea672df41a8
parentf31fd57c604fa1563243f3522924466be65f5e9a (diff)
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>
-rw-r--r--Makefile.sources1
-rw-r--r--freedreno/Makefile.sources1
-rw-r--r--include/drm/README5
-rw-r--r--include/drm/msm_drm.h (renamed from freedreno/msm/msm_drm.h)3
-rw-r--r--meson.build9
5 files changed, 8 insertions, 11 deletions
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/include/drm/README b/include/drm/README
index b4658dd7..521630db 100644
--- a/include/drm/README
+++ b/include/drm/README
@@ -122,11 +122,6 @@ omap_drm.h (living in $TOP/omap)
- License mismatch, missing DRM_IOCTL_OMAP_GEM_NEW and related struct
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)
- License mismatch, now using fixed size ints (but not everywhere). Lots of
new stuff.
diff --git a/freedreno/msm/msm_drm.h b/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',
)