Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc

Backmerge drm-next to be able to apply Chris' connector_unregister_all cleanup (need latest i915 and sun4i state for that). Also there's a trivial conflict in ttm_bo.c that git rerere fails to remember.

Daniel Vetter committed 10 years ago

Commit 23830502 parents a1bf09e 2d635fd1107 files · +25070 −13993Browse files

Showing the changes to include/uapi (6 of 1107 files). Show all

Unified · Split

6 files

include/uapi/drm/amdgpu_drm.h +17 −15
include/uapi/drm/i915_drm.h +3 −0
include/uapi/drm/vc4_drm.h +13 −0
include/uapi/linux/btrfs.h +1 −1
include/uapi/linux/gtp.h +1 −1
include/uapi/sound/Kbuild +3 −0

include/uapi/drm/amdgpu_drm.h+17−15

 #define AMDGPU_INFO_MMR_SH_INDEX_SHIFT	8
 #define AMDGPU_INFO_MMR_SH_INDEX_MASK	0xff
+struct drm_amdgpu_query_fw {
+	/** AMDGPU_INFO_FW_* */
+	__u32 fw_type;
+	/**
+	 * Index of the IP if there are more IPs of
+	 * the same type.
+	 */
+	__u32 ip_instance;
+	/**
+	 * Index of the engine. Whether this is used depends
+	 * on the firmware type. (e.g. MEC, SDMA)
+	 */
+	__u32 index;
+	__u32 _pad;
+};
 /* Input structure for the INFO ioctl */
 struct drm_amdgpu_info {
 	/* Where the return value will be stored */
 			__u32 flags;
 		} read_mmr_reg;
-		struct {
+		struct drm_amdgpu_query_fw query_fw;
-			/** AMDGPU_INFO_FW_* */
-			__u32 fw_type;
-			/**
-			 * Index of the IP if there are more IPs of
-			 * the same type.
-			 */
-			__u32 ip_instance;
-			/**
-			 * Index of the engine. Whether this is used depends
-			 * on the firmware type. (e.g. MEC, SDMA)
-			 */
-			__u32 index;
-			__u32 _pad;
-		} query_fw;
 	};
 };

include/uapi/drm/i915_drm.h+3−0

 #define I915_PARAM_HAS_GPU_RESET	 35
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 #define I915_PARAM_HAS_EXEC_SOFTPIN	 37
+#define I915_PARAM_HAS_POOLED_EU	 38
+#define I915_PARAM_MIN_EU_IN_POOL	 39
 typedef struct drm_i915_getparam {
 	__s32 param;
 #define I915_CONTEXT_PARAM_BAN_PERIOD	0x1
 #define I915_CONTEXT_PARAM_NO_ZEROMAP	0x2
 #define I915_CONTEXT_PARAM_GTT_SIZE	0x3
+#define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE	0x4
 	__u64 value;
 };

include/uapi/drm/vc4_drm.h+13−0

 #define DRM_VC4_MMAP_BO                           0x04
 #define DRM_VC4_CREATE_SHADER_BO                  0x05
 #define DRM_VC4_GET_HANG_STATE                    0x06
+#define DRM_VC4_GET_PARAM                         0x07
 #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)
 #define DRM_IOCTL_VC4_MMAP_BO             DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_MMAP_BO, struct drm_vc4_mmap_bo)
 #define DRM_IOCTL_VC4_CREATE_SHADER_BO    DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_CREATE_SHADER_BO, struct drm_vc4_create_shader_bo)
 #define DRM_IOCTL_VC4_GET_HANG_STATE      DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_HANG_STATE, struct drm_vc4_get_hang_state)
+#define DRM_IOCTL_VC4_GET_PARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_PARAM, struct drm_vc4_get_param)
 struct drm_vc4_submit_rcl_surface {
 	__u32 hindex; /* Handle index, or ~0 if not present. */
 	__u32 pad[16];
 };
+#define DRM_VC4_PARAM_V3D_IDENT0		0
+#define DRM_VC4_PARAM_V3D_IDENT1		1
+#define DRM_VC4_PARAM_V3D_IDENT2		2
+#define DRM_VC4_PARAM_SUPPORTS_BRANCHES		3
+struct drm_vc4_get_param {
+	__u32 param;
+	__u32 pad;
+	__u64 value;
+};
 #if defined(__cplusplus)
 }
 #endif

include/uapi/linux/btrfs.h+1−1

@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines
118	};	118	};
119	union {	119	union {
120	char name[BTRFS_SUBVOL_NAME_MAX + 1];	120	char name[BTRFS_SUBVOL_NAME_MAX + 1];
121	u64 devid;	121	__u64 devid;
122	};	122	};
123	};	123	};
124		124

include/uapi/linux/gtp.h+1−1

@@ -1,5 +1,5 @@
1	#ifndef _UAPI_LINUX_GTP_H_	1	#ifndef _UAPI_LINUX_GTP_H_
2	#define _UAPI_LINUX_GTP_H__	2	#define _UAPI_LINUX_GTP_H_
3		3
4	enum gtp_genl_cmds {	4	enum gtp_genl_cmds {
5	GTP_CMD_NEWPDP,	5	GTP_CMD_NEWPDP,

include/uapi/sound/Kbuild+3−0

 # UAPI Header export list
 header-y += asequencer.h
+header-y += asoc.h
 header-y += asound.h
 header-y += asound_fm.h
 header-y += compress_offload.h
 header-y += hdspm.h
 header-y += sb16_csp.h
 header-y += sfnt_info.h
+header-y += tlv.h
+header-y += usb_stream.h

Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code