Skip to contentSkip to conversation

msm: add msm drm uapi header

PATCH Superseded Tanmay Shah 3 participants 9 messages Jul 24, 2018 – Aug 14, 2018 3 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 msm: add msm drm uapi header

file derived from msm-next kernel uapi header.

---
 Makefile.sources      |   1 +
 include/drm/msm_drm.h | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 include/drm/msm_drm.h
Makefile.sources +1 -0
index 1f8372b..55290fe 100644
@@ -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 \
include/drm/msm_drm.h new file +308 -0

308 lines not on this page · raw message

Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
Quoted 7 lines · Eric Anholt
Quoted 1 line · Tanmay Shah

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.

Signature · 5 lines
Tanmay Shah
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw
Quoted 10 lines · Tanmay Shah
Quoted 7 lines · Eric Anholt
Quoted 1 line · Tanmay Shah

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
Quoted 13 lines · Eric Anholt
Quoted 10 lines · Tanmay Shah
Quoted 7 lines · Eric Anholt
Quoted 1 line · Tanmay Shah

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.

Quoted 8 lines

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
[email protected]
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.

Signature · 5 lines
Tanmay Shah
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#7 lore raw
In reply to a message not in the archive
Quoted 52 lines · Rob Clark
Quoted 38 lines · Tanmay Shah
Quoted 37 lines · Tanmay Shah
Quoted 18 lines · Eric Anholt
Quoted 7 lines · Tanmay Shah
Quoted 6 lines · Eric Anholt
Quoted 1 line · Tanmay Shah

file derived from msm-next kernel uapi header.

Quoted 6 lines
Quoted 3 lines

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.

Quoted 8 lines

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
[email protected]
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.

Quoted 6 lines
Quoted 3 lines

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..

Quoted 6 lines

(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.

Signature · 5 lines
Tanmay Shah
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#8 lore raw

PATCH v2 1/1 libdrm: add msm drm uapi header

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.

---
 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%)
Makefile.sources +1 -0
index 1f8372bc..55290fe9 100644
@@ -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 \
freedreno/Makefile.sources +0 -1
index 68a679bf..ca89511a 100644
@@ -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
include/drm/msm_drm.h renamed from freedreno/msm/msm_drm.h +2 -1
similarity index 99%
rename from freedreno/msm/msm_drm.h
rename to include/drm/msm_drm.h
index dac49e59..c06d0a5b 100644
@@ -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
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#10 lore raw

Re: [PATCH libdrm v2] libdrm: add msm drm uapi header

In reply to a message not in the archive
Quoted 7 lines · Tanmay Shah

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.

Looks like this is missing the meson.build update, and leaves a stale note in include/drm/README.

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

#11 lore raw

PATCH v3 1/1 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.

---
 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%)
Makefile.sources +1 -0
index 1f8372bc..55290fe9 100644
@@ -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 \
freedreno/Makefile.sources +0 -1
index 68a679bf..ca89511a 100644
@@ -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
include/drm/msm_drm.h renamed from freedreno/msm/msm_drm.h +2 -1
similarity index 99%
rename from freedreno/msm/msm_drm.h
rename to include/drm/msm_drm.h
index dac49e59..c06d0a5b 100644
@@ -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
meson.build +5 -4
index b2f9a290..56d1f151 100644
@@ -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',
 )
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel