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/drm (1 of 735 files). Show all

Unified · Split

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.