Cross-merge BPF and other fixes after downstream PR. No conflicts.
Showing the changes to include/uapi (2 of 500 files). Show all
Unified · Split
| @@ -1013,6 +1013,20 @@ struct drm_xe_vm_destroy { · 1012 unmodified lines | |||
| 1013 | * valid on VMs with DRM_XE_VM_CREATE_FLAG_FAULT_MODE set. The CPU address | 1013 | * valid on VMs with DRM_XE_VM_CREATE_FLAG_FAULT_MODE set. The CPU address |
| 1014 | * mirror flag are only valid for DRM_XE_VM_BIND_OP_MAP operations, the BO | 1014 | * mirror flag are only valid for DRM_XE_VM_BIND_OP_MAP operations, the BO |
| 1015 | * handle MBZ, and the BO offset MBZ. | 1015 | * handle MBZ, and the BO offset MBZ. |
| 1016 | * - %DRM_XE_VM_BIND_FLAG_MADVISE_AUTORESET - Can be used in combination with | ||
| 1017 | * %DRM_XE_VM_BIND_FLAG_CPU_ADDR_MIRROR to reset madvises when the underlying | ||
| 1018 | * CPU address space range is unmapped (typically with munmap(2) or brk(2)). | ||
| 1019 | * The madvise values set with &DRM_IOCTL_XE_MADVISE are reset to the values | ||
| 1020 | * that were present immediately after the &DRM_IOCTL_XE_VM_BIND. | ||
| 1021 | * The reset GPU virtual address range is the intersection of the range bound | ||
| 1022 | * using &DRM_IOCTL_XE_VM_BIND and the virtual CPU address space range | ||
| 1023 | * unmapped. | ||
| 1024 | * This functionality is present to mimic the behaviour of CPU address space | ||
| 1025 | * madvises set using madvise(2), which are typically reset on unmap. | ||
| 1026 | * Note: free(3) may or may not call munmap(2) and/or brk(2), and may thus | ||
| 1027 | * not invoke autoreset. Neither will stack variables going out of scope. | ||
| 1028 | * Therefore it's recommended to always explicitly reset the madvises when | ||
| 1029 | * freeing the memory backing a region used in a &DRM_IOCTL_XE_MADVISE call. | ||
| 1016 | * | 1030 | * |
| 1017 | * The @prefetch_mem_region_instance for %DRM_XE_VM_BIND_OP_PREFETCH can also be: | 1031 | * The @prefetch_mem_region_instance for %DRM_XE_VM_BIND_OP_PREFETCH can also be: |
| 1018 | * - %DRM_XE_CONSULT_MEM_ADVISE_PREF_LOC, which ensures prefetching occurs in | 1032 | * - %DRM_XE_CONSULT_MEM_ADVISE_PREF_LOC, which ensures prefetching occurs in |
| @@ -1119,6 +1133,7 @@ struct drm_xe_vm_bind_op { · 100 unmodified lines | |||
| 1119 | #define DRM_XE_VM_BIND_FLAG_DUMPABLE (1 << 3) | 1133 | #define DRM_XE_VM_BIND_FLAG_DUMPABLE (1 << 3) |
| 1120 | #define DRM_XE_VM_BIND_FLAG_CHECK_PXP (1 << 4) | 1134 | #define DRM_XE_VM_BIND_FLAG_CHECK_PXP (1 << 4) |
| 1121 | #define DRM_XE_VM_BIND_FLAG_CPU_ADDR_MIRROR (1 << 5) | 1135 | #define DRM_XE_VM_BIND_FLAG_CPU_ADDR_MIRROR (1 << 5) |
| 1136 | #define DRM_XE_VM_BIND_FLAG_MADVISE_AUTORESET (1 << 6) | ||
| 1122 | /** @flags: Bind flags */ | 1137 | /** @flags: Bind flags */ |
| 1123 | __u32 flags; | 1138 | __u32 flags; |
| 1124 | 1139 | ||
| @@ -319,7 +319,7 @@ enum { · 318 unmodified lines | |||
| 319 | #define FB_VBLANK_HAVE_VCOUNT 0x020 /* the vcount field is valid */ | 319 | #define FB_VBLANK_HAVE_VCOUNT 0x020 /* the vcount field is valid */ |
| 320 | #define FB_VBLANK_HAVE_HCOUNT 0x040 /* the hcount field is valid */ | 320 | #define FB_VBLANK_HAVE_HCOUNT 0x040 /* the hcount field is valid */ |
| 321 | #define FB_VBLANK_VSYNCING 0x080 /* currently in a vsync */ | 321 | #define FB_VBLANK_VSYNCING 0x080 /* currently in a vsync */ |
| 322 | #define FB_VBLANK_HAVE_VSYNC 0x100 /* verical syncs can be detected */ | 322 | #define FB_VBLANK_HAVE_VSYNC 0x100 /* vertical syncs can be detected */ |
| 323 | 323 | ||
| 324 | struct fb_vblank { | 324 | struct fb_vblank { |
| 325 | __u32 flags; /* FB_VBLANK flags */ | 325 | __u32 flags; /* FB_VBLANK flags */ |