History

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Tvrtko needs commit b3c11ac267d461d3d597967164ff7278a919a39f Author: Eric Engestrom <eric@engestrom.ch> Date: Sat Nov 12 01:12:56 2016 +0000 drm: move allocation out of drm_get_format_name() to be able to apply his patches without conflicts.

Daniel Vetter committed 10 years ago

Commit 39757972 parents 78424c9 b7c0e471017 files · +20006 −11231Browse files

Showing the changes to include/uapi (5 of 1017 files). Show all

Unified · Split

5 files
  1. include/uapi/drm/amdgpu_drm.h +28 −0
  2. include/uapi/drm/drm_mode.h +9 −7
  3. include/uapi/drm/vc4_drm.h +2 −0
  4. include/uapi/linux/ethtool.h +1 −2
  5. include/uapi/linux/rtnetlink.h +1 −1
include/uapi/drm/amdgpu_drm.h+28−0
@@ -50,6 +50,7 @@ extern "C" { · 49 unmodified lines
5050 #define DRM_AMDGPU_WAIT_CS 0x09
5151 #define DRM_AMDGPU_GEM_OP 0x10
5252 #define DRM_AMDGPU_GEM_USERPTR 0x11
53+#define DRM_AMDGPU_WAIT_FENCES 0x12
5354
5455 #define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
5556 #define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -63,6 +64,7 @@ extern "C" { · 7 unmodified lines
6364 #define DRM_IOCTL_AMDGPU_WAIT_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_CS, union drm_amdgpu_wait_cs)
6465 #define DRM_IOCTL_AMDGPU_GEM_OP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_OP, struct drm_amdgpu_gem_op)
6566 #define DRM_IOCTL_AMDGPU_GEM_USERPTR DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_USERPTR, struct drm_amdgpu_gem_userptr)
67+#define DRM_IOCTL_AMDGPU_WAIT_FENCES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_FENCES, union drm_amdgpu_wait_fences)
6668
6769 #define AMDGPU_GEM_DOMAIN_CPU 0x1
6870 #define AMDGPU_GEM_DOMAIN_GTT 0x2
@@ -307,6 +309,32 @@ union drm_amdgpu_wait_cs { · 238 unmodified lines
307309 struct drm_amdgpu_wait_cs_out out;
308310 };
309311
312+struct drm_amdgpu_fence {
313+ __u32 ctx_id;
314+ __u32 ip_type;
315+ __u32 ip_instance;
316+ __u32 ring;
317+ __u64 seq_no;
318+};
319+
320+struct drm_amdgpu_wait_fences_in {
321+ /** This points to uint64_t * which points to fences */
322+ __u64 fences;
323+ __u32 fence_count;
324+ __u32 wait_all;
325+ __u64 timeout_ns;
326+};
327+
328+struct drm_amdgpu_wait_fences_out {
329+ __u32 status;
330+ __u32 first_signaled;
331+};
332+
333+union drm_amdgpu_wait_fences {
334+ struct drm_amdgpu_wait_fences_in in;
335+ struct drm_amdgpu_wait_fences_out out;
336+};
337+
310338 #define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO 0
311339 #define AMDGPU_GEM_OP_SET_PLACEMENT 1
312340
include/uapi/drm/drm_mode.h+9−7
@@ -47,7 +47,15 @@ extern "C" { · 46 unmodified lines
4747 #define DRM_MODE_TYPE_DRIVER (1<<6)
4848
4949 /* Video mode flags */
50−/* bit compatible with the xorg definitions. */
50+/* bit compatible with the xrandr RR_ definitions (bits 0-13)
51+ *
52+ * ABI warning: Existing userspace really expects
53+ * the mode flags to match the xrandr definitions. Any
54+ * changes that don't match the xrandr definitions will
55+ * likely need a new client cap or some other mechanism
56+ * to avoid breaking existing userspace. This includes
57+ * allocating new flags in the previously unused bits!
58+ */
5159 #define DRM_MODE_FLAG_PHSYNC (1<<0)
5260 #define DRM_MODE_FLAG_NHSYNC (1<<1)
5361 #define DRM_MODE_FLAG_PVSYNC (1<<2)
@@ -81,8 +89,6 @@ extern "C" { · 27 unmodified lines
8189 #define DRM_MODE_PICTURE_ASPECT_NONE 0
8290 #define DRM_MODE_PICTURE_ASPECT_4_3 1
8391 #define DRM_MODE_PICTURE_ASPECT_16_9 2
84−#define DRM_MODE_PICTURE_ASPECT_64_27 3
85−#define DRM_MODE_PICTURE_ASPECT_256_135 4
8692
8793 /* Aspect ratio flag bitmask (4 bits 22:19) */
8894 #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19)
@@ -92,10 +98,6 @@ extern "C" { · 3 unmodified lines
9298 (DRM_MODE_PICTURE_ASPECT_4_3<<19)
9399 #define DRM_MODE_FLAG_PIC_AR_16_9 \
94100 (DRM_MODE_PICTURE_ASPECT_16_9<<19)
95−#define DRM_MODE_FLAG_PIC_AR_64_27 \
96− (DRM_MODE_PICTURE_ASPECT_64_27<<19)
97−#define DRM_MODE_FLAG_PIC_AR_256_135 \
98− (DRM_MODE_PICTURE_ASPECT_256_135<<19)
99101
100102 /* DPMS flags */
101103 /* bit compatible with the xorg definitions. */
include/uapi/drm/vc4_drm.h+2−0
@@ -286,6 +286,8 @@ struct drm_vc4_get_hang_state { · 285 unmodified lines
286286 #define DRM_VC4_PARAM_V3D_IDENT1 1
287287 #define DRM_VC4_PARAM_V3D_IDENT2 2
288288 #define DRM_VC4_PARAM_SUPPORTS_BRANCHES 3
289+#define DRM_VC4_PARAM_SUPPORTS_ETC1 4
290+#define DRM_VC4_PARAM_SUPPORTS_THREADED_FS 5
289291
290292 struct drm_vc4_get_param {
291293 __u32 param;
include/uapi/linux/ethtool.h+1−2
@@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines
119119 static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
120120 __u32 speed)
121121 {
122−
123− ep->speed = (__u16)speed;
122+ ep->speed = (__u16)(speed & 0xFFFF);
124123 ep->speed_hi = (__u16)(speed >> 16);
125124 }
126125
include/uapi/linux/rtnetlink.h+1−1
@@ -350,7 +350,7 @@ struct rtnexthop { · 349 unmodified lines
350350 #define RTNH_F_OFFLOAD 8 /* offloaded route */
351351 #define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
352352
353−#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN)
353+#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
354354
355355 /* Macros to handle hexthops */
356356

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t