58 lines
1.4 KiB
Diff
58 lines
1.4 KiB
Diff
From 90b7852c0f8ef37d5d3918db0a889dcb2aeda930 Mon Sep 17 00:00:00 2001
|
|
From: ryang <decatf@gmail.com>
|
|
Date: Thu, 9 Aug 2018 18:34:27 -0400
|
|
Subject: [PATCH 3/5] Revert "drm-uapi: bump headers"
|
|
|
|
This reverts commit 5d3e74a5a539559612d41432e9cef8d1b2ce0638.
|
|
---
|
|
include/drm-uapi/tegra_drm.h | 22 +++++++++++++++++++---
|
|
1 file changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/drm-uapi/tegra_drm.h b/include/drm-uapi/tegra_drm.h
|
|
index 12f9bf8..910cbe0 100644
|
|
--- a/include/drm-uapi/tegra_drm.h
|
|
+++ b/include/drm-uapi/tegra_drm.h
|
|
@@ -117,6 +117,20 @@ struct drm_tegra_waitchk {
|
|
__u32 thresh;
|
|
};
|
|
|
|
+#define DRM_TEGRA_FENCE_WAIT (1 << 0)
|
|
+#define DRM_TEGRA_FENCE_EMIT (1 << 1)
|
|
+#define DRM_TEGRA_FENCE_FD (1 << 2)
|
|
+#define DRM_TEGRA_FENCE_FLAGS (DRM_TEGRA_FENCE_WAIT | \
|
|
+ DRM_TEGRA_FENCE_EMIT | \
|
|
+ DRM_TEGRA_FENCE_FD)
|
|
+
|
|
+struct drm_tegra_fence {
|
|
+ __u32 handle;
|
|
+ __u32 flags;
|
|
+};
|
|
+
|
|
+#define DRM_TEGRA_SUBMIT_FLAGS 0
|
|
+
|
|
struct drm_tegra_submit {
|
|
__u64 context;
|
|
__u32 num_syncpts;
|
|
@@ -129,9 +143,11 @@ struct drm_tegra_submit {
|
|
__u64 cmdbufs;
|
|
__u64 relocs;
|
|
__u64 waitchks;
|
|
- __u32 fence; /* Return value */
|
|
+ __u32 flags;
|
|
+ __u32 num_fences;
|
|
+ __u64 fences;
|
|
|
|
- __u32 reserved[5]; /* future expansion */
|
|
+ __u32 reserved[2]; /* future expansion */
|
|
};
|
|
|
|
#define DRM_TEGRA_GEM_TILING_MODE_PITCH 0
|
|
@@ -206,4 +222,4 @@ struct drm_tegra_gem_get_flags {
|
|
}
|
|
#endif
|
|
|
|
-#endif
|
|
+#endif /* _TEGRA_DRM_H_ */
|
|
--
|
|
2.7.4
|
|
|