Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.
Showing the changes to include/uapi/linux (2 of 549 files). Show all
Unified · Split
| @@ -1467,8 +1467,8 @@ union bpf_attr { · 1466 unmodified lines | ||
| 1467 | 1467 | * If no cookie has been set yet, generate a new cookie. Once |
| 1468 | 1468 | * generated, the socket cookie remains stable for the life of the |
| 1469 | 1469 | * socket. This helper can be useful for monitoring per socket |
| 1470 | − * networking traffic statistics as it provides a unique socket | |
| 1471 | − * identifier per namespace. | |
| 1470 | + * networking traffic statistics as it provides a global socket | |
| 1471 | + * identifier that can be assumed unique. | |
| 1472 | 1472 | * Return |
| 1473 | 1473 | * A 8-byte long non-decreasing number on success, or 0 if the |
| 1474 | 1474 | * socket field is missing inside *skb*. |
| @@ -410,21 +410,6 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 409 unmodified lines | ||
| 410 | 410 | __u32 n_success; /* to/from KFD */ |
| 411 | 411 | }; |
| 412 | 412 | |
| 413 | −/* Allocate GWS for specific queue | |
| 414 | − * | |
| 415 | − * @gpu_id: device identifier | |
| 416 | − * @queue_id: queue's id that GWS is allocated for | |
| 417 | − * @num_gws: how many GWS to allocate | |
| 418 | − * @first_gws: index of the first GWS allocated. | |
| 419 | − * only support contiguous GWS allocation | |
| 420 | − */ | |
| 421 | −struct kfd_ioctl_alloc_queue_gws_args { | |
| 422 | − __u32 gpu_id; /* to KFD */ | |
| 423 | − __u32 queue_id; /* to KFD */ | |
| 424 | − __u32 num_gws; /* to KFD */ | |
| 425 | − __u32 first_gws; /* from KFD */ | |
| 426 | −}; | |
| 427 | − | |
| 428 | 413 | struct kfd_ioctl_get_dmabuf_info_args { |
| 429 | 414 | __u64 size; /* from KFD */ |
| 430 | 415 | __u64 metadata_ptr; /* to KFD */ |
| @@ -544,10 +529,7 @@ enum kfd_mmio_remap { · 113 unmodified lines | ||
| 544 | 529 | #define AMDKFD_IOC_IMPORT_DMABUF \ |
| 545 | 530 | AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args) |
| 546 | 531 | |
| 547 | −#define AMDKFD_IOC_ALLOC_QUEUE_GWS \ | |
| 548 | − AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args) | |
| 549 | − | |
| 550 | 532 | #define AMDKFD_COMMAND_START 0x01 |
| 551 | −#define AMDKFD_COMMAND_END 0x1F | |
| 533 | +#define AMDKFD_COMMAND_END 0x1E | |
| 552 | 534 | |
| 553 | 535 | #endif |