Skip to contentSkip to conversation

drm-next header syncing

PATCH In review Eric Anholt 3 participants 9 messages Nov 8, 2017 – Nov 10, 2017

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

cover drm-next header syncing

I wanted to update the vc4 header so that I could land some igt testcases (though I'd much rather just be importing the header into igt and ditching libdrm). In the process, I cleaned up some other header deltas to the kernel so that there's less diff for the next person to look at.

I skipped the actual ABI changes for the other drivers, though.

Eric Anholt (6):
headers: Sync vc4 header from drm-next.
headers: Sync up some header guard changes from drm-next.
headers: Sync up some comment spelling and whitespace fixes from
drm-next.
headers: Sync up mga_drm.h from drm-next.
headers: Sync up kernel changes to use kernel types instead of
stdint.h.
headers: Drop outdated node about a delta in drm_mode.h.

 include/drm/README        |  22 +-------
 include/drm/mga_drm.h     |  12 ++++-
 include/drm/nouveau_drm.h |  94 +++++++++++++++++++---------------
 include/drm/qxl_drm.h     |  82 +++++++++++++++--------------
 include/drm/r128_drm.h    |  10 ++++
 include/drm/radeon_drm.h  | 128 +++++++++++++++++++++++-----------------------
 include/drm/savage_drm.h  |  20 ++++++--
 include/drm/sis_drm.h     |  10 ++++
 include/drm/tegra_drm.h   |  14 +++--
 include/drm/vc4_drm.h     |  47 +++++++++++++++--
 include/drm/via_drm.h     |   8 +++
 include/drm/vmwgfx_drm.h  |   9 ++++
 12 files changed, 280 insertions(+), 176 deletions(-)
Signature · 6 lines
2.15.0

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

PATCH 1/6 headers: Sync vc4 header from drm-next.

This updates the header with the contents from drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next")

---
 include/drm/vc4_drm.h | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)
include/drm/vc4_drm.h +44 -3
index 6ac4c5c014cb..3415a4b71884 100644
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef _UAPI_VC4_DRM_H_
-#define _UAPI_VC4_DRM_H_
+#ifndef _VC4_DRM_H_
+#define _VC4_DRM_H_
 
 #include "drm.h"
 
@@ -40,6 +40,8 @@ extern "C" {
 #define DRM_VC4_GET_PARAM                         0x07
 #define DRM_VC4_SET_TILING                        0x08
 #define DRM_VC4_GET_TILING                        0x09
+#define DRM_VC4_LABEL_BO                          0x0a
+#define DRM_VC4_GEM_MADVISE                       0x0b
 
 #define DRM_IOCTL_VC4_SUBMIT_CL           DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_SUBMIT_CL, struct drm_vc4_submit_cl)
 #define DRM_IOCTL_VC4_WAIT_SEQNO          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_WAIT_SEQNO, struct drm_vc4_wait_seqno)
@@ -51,6 +53,8 @@ extern "C" {
 #define DRM_IOCTL_VC4_GET_PARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_PARAM, struct drm_vc4_get_param)
 #define DRM_IOCTL_VC4_SET_TILING          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_SET_TILING, struct drm_vc4_set_tiling)
 #define DRM_IOCTL_VC4_GET_TILING          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_TILING, struct drm_vc4_get_tiling)
+#define DRM_IOCTL_VC4_LABEL_BO            DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_LABEL_BO, struct drm_vc4_label_bo)
+#define DRM_IOCTL_VC4_GEM_MADVISE         DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GEM_MADVISE, struct drm_vc4_gem_madvise)
 
 struct drm_vc4_submit_rcl_surface {
 	__u32 hindex; /* Handle index, or ~0 if not present. */
@@ -153,6 +157,16 @@ struct drm_vc4_submit_cl {
 	__u32 pad:24;
 
 #define VC4_SUBMIT_CL_USE_CLEAR_COLOR			(1 << 0)
+/* By default, the kernel gets to choose the order that the tiles are
+ * rendered in.  If this is set, then the tiles will be rendered in a
+ * raster order, with the right-to-left vs left-to-right and
+ * top-to-bottom vs bottom-to-top dictated by
+ * VC4_SUBMIT_CL_RCL_ORDER_INCREASING_*.  This allows overlapping
+ * blits to be implemented using the 3D engine.
+ */
+#define VC4_SUBMIT_CL_FIXED_RCL_ORDER			(1 << 1)
+#define VC4_SUBMIT_CL_RCL_ORDER_INCREASING_X		(1 << 2)
+#define VC4_SUBMIT_CL_RCL_ORDER_INCREASING_Y		(1 << 3)
 	__u32 flags;
 
 	/* Returned value of the seqno of this render job (for the
@@ -292,6 +306,8 @@ struct drm_vc4_get_hang_state {
 #define DRM_VC4_PARAM_SUPPORTS_BRANCHES		3
 #define DRM_VC4_PARAM_SUPPORTS_ETC1		4
 #define DRM_VC4_PARAM_SUPPORTS_THREADED_FS	5
+#define DRM_VC4_PARAM_SUPPORTS_FIXED_RCL_ORDER	6
+#define DRM_VC4_PARAM_SUPPORTS_MADVISE		7
 
 struct drm_vc4_get_param {
 	__u32 param;
@@ -311,8 +327,33 @@ struct drm_vc4_set_tiling {
 	__u64 modifier;
 };
 
+/**
+ * struct drm_vc4_label_bo - Attach a name to a BO for debug purposes.
+ */
+struct drm_vc4_label_bo {
+	__u32 handle;
+	__u32 len;
+	__u64 name;
+};
+
+/*
+ * States prefixed with '__' are internal states and cannot be passed to the
+ * DRM_IOCTL_VC4_GEM_MADVISE ioctl.
+ */
+#define VC4_MADV_WILLNEED			0
+#define VC4_MADV_DONTNEED			1
+#define __VC4_MADV_PURGED			2
+#define __VC4_MADV_NOTSUPP			3
+
+struct drm_vc4_gem_madvise {
+	__u32 handle;
+	__u32 madv;
+	__u32 retained;
+	__u32 pad;
+};
+
 #if defined(__cplusplus)
 }
 #endif
 
-#endif /* _UAPI_VC4_DRM_H_ */
+#endif /* _VC4_DRM_H_ */
Signature · 6 lines
2.15.0

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

PATCH 2/6 headers: Sync up some header guard changes from drm-next.

In reply to Eric Anholt

This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next")

---
 include/drm/README        |  4 ----
 include/drm/mga_drm.h     |  8 ++++++++
 include/drm/nouveau_drm.h | 10 ++++++++++
 include/drm/qxl_drm.h     |  8 ++++++++
 include/drm/r128_drm.h    | 10 ++++++++++
 include/drm/savage_drm.h  | 10 ++++++++++
 include/drm/sis_drm.h     | 10 ++++++++++
 include/drm/tegra_drm.h   | 14 +++++++++++---
 include/drm/via_drm.h     |  8 ++++++++
 include/drm/vmwgfx_drm.h  |  9 +++++++++
 10 files changed, 84 insertions(+), 7 deletions(-)
include/drm/README +0 -4
index 870b0b5b6a87..47d80929a8f1 100644
@@ -86,10 +86,6 @@ Outdated or Broken Headers
 This section contains a list of headers and the respective "issues" they might
 have relative to their kernel equivalent.
 
-Nearly all headers:
- - Missing extern C notation.
-Status: Trivial.
-
 Most UMS headers:
  - Not using fixed size integers - compat ioctls are broken.
 Status: ?
include/drm/mga_drm.h +8 -0
index b630e8fad548..f54e7a2e96a4 100644
@@ -37,6 +37,10 @@
 
 #include "drm.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the Xserver file (mga_sarea.h)
  */
@@ -416,4 +420,8 @@ typedef struct drm_mga_getparam {
 	void *value;
 } drm_mga_getparam_t;
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
include/drm/nouveau_drm.h +10 -0
index e418f9f3899f..542a732bf065 100644
@@ -27,6 +27,12 @@
 
 #define NOUVEAU_DRM_HEADER_PATCHLEVEL 16
 
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 struct drm_nouveau_channel_alloc {
 	uint32_t     fb_ctxdma_handle;
 	uint32_t     tt_ctxdma_handle;
@@ -207,4 +213,8 @@ struct drm_nouveau_sarea {
 #define DRM_NOUVEAU_GEM_CPU_FINI       0x43
 #define DRM_NOUVEAU_GEM_INFO           0x44
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* __NOUVEAU_DRM_H__ */
include/drm/qxl_drm.h +8 -0
index 1e331a867b53..ccd841b173f0 100644
@@ -27,6 +27,10 @@
 #include <stddef.h>
 #include "drm.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
  *
@@ -149,4 +153,8 @@ struct drm_qxl_alloc_surf {
 	DRM_IOWR(DRM_COMMAND_BASE + DRM_QXL_ALLOC_SURF,\
 		struct drm_qxl_alloc_surf)
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
include/drm/r128_drm.h +10 -0
index ede78ff9d41f..bf431a02333d 100644
@@ -33,6 +33,12 @@
 #ifndef __R128_DRM_H__
 #define __R128_DRM_H__
 
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the X server file (r128_sarea.h)
  */
@@ -323,4 +329,8 @@ typedef struct drm_r128_getparam {
 	void *value;
 } drm_r128_getparam_t;
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
include/drm/savage_drm.h +10 -0
index f7a75eff007f..26f387b78b15 100644
@@ -26,6 +26,12 @@
 #ifndef __SAVAGE_DRM_H__
 #define __SAVAGE_DRM_H__
 
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #ifndef __SAVAGE_SAREA_DEFINES__
 #define __SAVAGE_SAREA_DEFINES__
 
@@ -207,4 +213,8 @@ union drm_savage_cmd_header {
 	} clear1;		/* SAVAGE_CMD_CLEAR data */
 };
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
include/drm/sis_drm.h +10 -0
index 30f7b3827466..8e51bb9a5cac 100644
@@ -27,6 +27,12 @@
 #ifndef __SIS_DRM_H__
 #define __SIS_DRM_H__
 
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* SiS specific ioctls */
 #define NOT_USED_0_3
 #define DRM_SIS_FB_ALLOC	0x04
@@ -64,4 +70,8 @@ typedef struct {
 	unsigned int offset, size;
 } drm_sis_fb_t;
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif				/* __SIS_DRM_H__ */
include/drm/tegra_drm.h +11 -3
index 7c0fe0ed511b..12f9bf848db1 100644
@@ -20,10 +20,14 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _UAPI_TEGRA_DRM_H_
-#define _UAPI_TEGRA_DRM_H_
+#ifndef _TEGRA_DRM_H_
+#define _TEGRA_DRM_H_
 
-#include <drm.h>
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 #define DRM_TEGRA_GEM_CREATE_TILED     (1 << 0)
 #define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)
@@ -198,4 +202,8 @@ struct drm_tegra_gem_get_flags {
 #define DRM_IOCTL_TEGRA_GEM_SET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_SET_FLAGS, struct drm_tegra_gem_set_flags)
 #define DRM_IOCTL_TEGRA_GEM_GET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_GET_FLAGS, struct drm_tegra_gem_get_flags)
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
include/drm/via_drm.h +8 -0
index 182f8792fb46..8b69e8197eb3 100644
@@ -26,6 +26,10 @@
 
 #include "drm.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /* WARNING: These defines must be the same as what the Xserver uses.
  * if you change them, you must change the defines in the Xserver.
  */
@@ -272,4 +276,8 @@ typedef struct drm_via_dmablit {
 	drm_via_blitsync_t sync;
 } drm_via_dmablit_t;
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif				/* _VIA_DRM_H_ */
include/drm/vmwgfx_drm.h +9 -0
index 5b68b4d10884..d325a4107916 100644
@@ -30,6 +30,10 @@
 
 #include "drm.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #define DRM_VMW_MAX_SURFACE_FACES 6
 #define DRM_VMW_MAX_MIP_LEVELS 24
 
@@ -1087,4 +1091,9 @@ union drm_vmw_extended_context_arg {
 	enum drm_vmw_extended_context req;
 	struct drm_vmw_context_arg rep;
 };
+
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
Signature · 6 lines
2.15.0

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

PATCH 3/6 headers: Sync up some comment spelling and whitespace fixes from drm-next.

In reply to Eric Anholt

This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next")

---
 include/drm/mga_drm.h    |  2 +-
 include/drm/qxl_drm.h    |  2 +-
 include/drm/savage_drm.h | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
include/drm/mga_drm.h +1 -1
index f54e7a2e96a4..7035a664d503 100644
@@ -111,7 +111,7 @@ extern "C" {
  */
 #define MGA_NR_SAREA_CLIPRECTS	8
 
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
  *
  * Clients may subdivide regions internally, but when sharing between
include/drm/qxl_drm.h +1 -1
index ccd841b173f0..a520123b7720 100644
@@ -34,7 +34,7 @@ extern "C" {
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
  *
- * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel
+ * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel
  * compatibility Keep fields aligned to their size
  */
 
include/drm/savage_drm.h +5 -5
index 26f387b78b15..1a91234e6751 100644
@@ -35,7 +35,7 @@ extern "C" {
 #ifndef __SAVAGE_SAREA_DEFINES__
 #define __SAVAGE_SAREA_DEFINES__
 
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
  *
  * Clients may subdivide regions internally, but when sharing between
@@ -69,10 +69,10 @@ typedef struct _drm_savage_sarea {
 #define DRM_SAVAGE_BCI_EVENT_EMIT	0x02
 #define DRM_SAVAGE_BCI_EVENT_WAIT	0x03
 
-#define DRM_IOCTL_SAVAGE_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t)
-#define DRM_IOCTL_SAVAGE_CMDBUF		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t)
-#define DRM_IOCTL_SAVAGE_EVENT_EMIT	DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t)
-#define DRM_IOCTL_SAVAGE_EVENT_WAIT	DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t)
+#define DRM_IOCTL_SAVAGE_BCI_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t)
+#define DRM_IOCTL_SAVAGE_BCI_CMDBUF		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t)
+#define DRM_IOCTL_SAVAGE_BCI_EVENT_EMIT	DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t)
+#define DRM_IOCTL_SAVAGE_BCI_EVENT_WAIT	DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t)
 
 #define SAVAGE_DMA_PCI	1
 #define SAVAGE_DMA_AGP	3
Signature · 6 lines
2.15.0

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

PATCH 4/6 headers: Sync up mga_drm.h from drm-next.

In reply to Eric Anholt

The kernel started using the struct from drm.h instead of the typedef.

---
 include/drm/README    | 4 ----
 include/drm/mga_drm.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
include/drm/README +0 -4
index 47d80929a8f1..6e12ca4d81f6 100644
@@ -100,10 +100,6 @@ i915_drm.h
  - Missing PARAMS - HAS_POOLED_EU, MIN_EU_IN_POOL CONTEXT_PARAM_NO_ERROR_CAPTURE
 Status: Trivial.
 
-mga_drm.h
- - Typo fix, use struct over typedef.
-Status: Trivial.
-
 nouveau_drm.h
  - Missing macros NOUVEAU_GETPARAM*, NOUVEAU_DRM_HEADER_PATCHLEVEL, structs,
 enums, using stdint.h over the __u* types.
include/drm/mga_drm.h +1 -1
index 7035a664d503..793001114821 100644
@@ -252,7 +252,7 @@ typedef struct _drm_mga_sarea {
 #define DRM_MGA_DMA_BOOTSTRAP  0x0c
 
 #define DRM_IOCTL_MGA_INIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t)
-#define DRM_IOCTL_MGA_FLUSH    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t)
+#define DRM_IOCTL_MGA_FLUSH    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, struct drm_lock)
 #define DRM_IOCTL_MGA_RESET    DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_RESET)
 #define DRM_IOCTL_MGA_SWAP     DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_SWAP)
 #define DRM_IOCTL_MGA_CLEAR    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t)
Signature · 6 lines
2.15.0

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

PATCH 5/6 headers: Sync up kernel changes to use kernel types instead of stdint.h.

In reply to Eric Anholt

This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next")

---
 include/drm/README        |   9 +---
 include/drm/nouveau_drm.h |  84 +++++++++++++++---------------
 include/drm/qxl_drm.h     |  72 +++++++++++++-------------
 include/drm/radeon_drm.h  | 128 +++++++++++++++++++++++-----------------------
 4 files changed, 144 insertions(+), 149 deletions(-)
include/drm/README +2 -7
index 6e12ca4d81f6..042cfb1786f2 100644
@@ -102,19 +102,14 @@ Status: Trivial.
 
 nouveau_drm.h
  - Missing macros NOUVEAU_GETPARAM*, NOUVEAU_DRM_HEADER_PATCHLEVEL, structs,
-enums, using stdint.h over the __u* types.
+enums
 Status: ?
 
-qxl_drm.h
- - Using the stdint.h uint*_t over the respective __u* ones
-Status: Trivial.
-
 r128_drm.h
  - Broken compat ioctls.
 
 radeon_drm.h
- - Missing RADEON_TILING_R600_NO_SCANOUT, CIK_TILE_MODE_*, broken UMS ioctls,
-using stdint types.
+ - Missing RADEON_TILING_R600_NO_SCANOUT, CIK_TILE_MODE_*, broken UMS ioctls
  - Both kernel and libdrm: missing padding -
 drm_radeon_gem_{create,{g,s}et_tiling,set_domain} others ?
 Status: ?
include/drm/nouveau_drm.h +42 -42

123 lines not on this page · raw message

include/drm/qxl_drm.h +36 -36

109 lines not on this page · raw message

include/drm/radeon_drm.h +64 -64

215 lines not on this page · raw message

Signature · 1 line
2.15.0
#6 lore raw

PATCH 6/6 headers: Drop outdated node about a delta in drm_mode.h.

In reply to Eric Anholt

Fixed in 9433b702fc16 ("headers: Sync drm{,_mode}.h with the kernel")

---
 include/drm/README | 5 -----
 1 file changed, 5 deletions(-)
include/drm/README +0 -5
index 042cfb1786f2..5b518ddf8f03 100644
@@ -91,11 +91,6 @@ Most UMS headers:
 Status: ?
 Promote to fixed size ints, which match the current (32bit) ones.
 
-
-drm_mode.h
- - Missing DPI encode/connector pair.
-Status: Trivial.
-
 i915_drm.h
  - Missing PARAMS - HAS_POOLED_EU, MIN_EU_IN_POOL CONTEXT_PARAM_NO_ERROR_CAPTURE
 Status: Trivial.
Signature · 6 lines
2.15.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#7 lore raw
In reply to Eric Anholt
Quoted 5 lines · Eric Anholt

I wanted to update the vc4 header so that I could land some igt testcases (though I'd much rather just be importing the header into igt and ditching libdrm). In the process, I cleaned up some other header deltas to the kernel so that there's less diff for the next person to look at.

I'm mildly tempted to just pull a mesa in igt too and put the headers in directly. To avoid the need for way too many libdrm releases when hacking on tests we atm add all the uapi stuff with a local_ prefix, but that's kinda silly.

Maybe start a thread with vc4 as example converted (I guess we need to make sure the include order is right) to get this started. -Daniel

Quoted 34 lines

I skipped the actual ABI changes for the other drivers, though.

Eric Anholt (6):
headers: Sync vc4 header from drm-next.
headers: Sync up some header guard changes from drm-next.
headers: Sync up some comment spelling and whitespace fixes from
drm-next.
headers: Sync up mga_drm.h from drm-next.
headers: Sync up kernel changes to use kernel types instead of
stdint.h.
headers: Drop outdated node about a delta in drm_mode.h.

 include/drm/README        |  22 +-------
 include/drm/mga_drm.h     |  12 ++++-
 include/drm/nouveau_drm.h |  94 +++++++++++++++++++---------------
 include/drm/qxl_drm.h     |  82 +++++++++++++++--------------
 include/drm/r128_drm.h    |  10 ++++
 include/drm/radeon_drm.h  | 128 +++++++++++++++++++++++-----------------------
 include/drm/savage_drm.h  |  20 ++++++--
 include/drm/sis_drm.h     |  10 ++++
 include/drm/tegra_drm.h   |  14 +++--
 include/drm/vc4_drm.h     |  47 +++++++++++++++--
 include/drm/via_drm.h     |   8 +++
 include/drm/vmwgfx_drm.h  |   9 ++++
 12 files changed, 280 insertions(+), 176 deletions(-)
Signature · 6 lines
2.15.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by
#8 lore raw
Quoted 7 lines · Daniel Vetter
Quoted 5 lines · Eric Anholt

I wanted to update the vc4 header so that I could land some igt testcases (though I'd much rather just be importing the header into igt and ditching libdrm). In the process, I cleaned up some other header deltas to the kernel so that there's less diff for the next person to look at.

Quoted 7 lines

I'm mildly tempted to just pull a mesa in igt too and put the headers in directly. To avoid the need for way too many libdrm releases when hacking on tests we atm add all the uapi stuff with a local_ prefix, but that's kinda silly.

Maybe start a thread with vc4 as example converted (I guess we need to make sure the include order is right) to get this started.

That shouldn't be an obstacle to merging Eric's patches, right?

I went through the series and it looks good. For the lot

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