History

Merge drm/drm-next into drm-misc-next

Biju Das needs a patch for rz-du merged in 7.0-rc3

Maxime Ripard committed 8 months ago

Commit f08ceb72 parents f66d6cc 58351f4735 files · +112973 −6958Browse files

Showing the changes to include/uapi (3 of 735 files). Show all

Unified · Split

3 files
  1. include/uapi/drm/amdgpu_drm.h +5 −2
  2. include/uapi/linux/dma-buf.h +1 −0
  3. include/uapi/linux/io_uring.h +2 −1
include/uapi/drm/amdgpu_drm.h+5−2
@@ -479,7 +479,9 @@ struct drm_amdgpu_userq_signal { · 478 unmodified lines
479479 * @num_syncobj_handles: A count that represents the number of syncobj handles in
480480 * @syncobj_handles.
481481 */
482− __u64 num_syncobj_handles;
482+ __u16 num_syncobj_handles;
483+ __u16 pad0;
484+ __u32 pad1;
483485 /**
484486 * @bo_read_handles: The list of BO handles that the submitted user queue job
485487 * is using for read only. This will update BO fences in the kernel.
@@ -563,7 +565,8 @@ struct drm_amdgpu_userq_wait { · 77 unmodified lines
563565 * @num_syncobj_handles: A count that represents the number of syncobj handles in
564566 * @syncobj_handles.
565567 */
566− __u32 num_syncobj_handles;
568+ __u16 num_syncobj_handles;
569+ __u16 pad0;
567570 /**
568571 * @num_bo_read_handles: A count that represents the number of read BO handles in
569572 * @bo_read_handles.
include/uapi/linux/dma-buf.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #ifndef _DMA_BUF_UAPI_H_
2121 #define _DMA_BUF_UAPI_H_
2222
23+#include <linux/ioctl.h>
2324 #include <linux/types.h>
2425
2526 /**
include/uapi/linux/io_uring.h+2−1
@@ -188,7 +188,8 @@ enum io_uring_sqe_flags_bit { · 187 unmodified lines
188188 /*
189189 * If COOP_TASKRUN is set, get notified if task work is available for
190190 * running and a kernel transition would be needed to run it. This sets
191− * IORING_SQ_TASKRUN in the sq ring flags. Not valid with COOP_TASKRUN.
191+ * IORING_SQ_TASKRUN in the sq ring flags. Not valid without COOP_TASKRUN
192+ * or DEFER_TASKRUN.
192193 */
193194 #define IORING_SETUP_TASKRUN_FLAG (1U << 9)
194195 #define IORING_SETUP_SQE128 (1U << 10) /* SQEs are 128 byte */