History

Merge tag 'drm-intel-gt-next-2022-03-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

Cross-subsystem Changes: - drm-next backmerge for buddy allocator changes Driver Changes: - Skip i915_perf init for DG2 as it is not yet enabled (Ram) - Add missing workarounds for DG2 (Clint) - Add 64K page/align support for platforms like DG2 that require it (Matt A, Ram, Bob) - Add accelerated migration support for DG2 (Matt A) - Add flat CCS support for XeHP SDV (Abdiel, Ram) - Add Compute Command Streamer (CCS) engine support for XeHP SDV (Michel, Daniele, Aravind, Matt R) - Don't support parallel submission on compute / render (Matt B, Matt R) - Disable i915 build on PREEMPT_RT until RT behaviour fixed (Sebastian) - Remove RPS interrupt support for TGL+ (Jose) - Fix S/R with PM_EARLY for non-GTT mappable objects on DG2 (Matt, Lucas) - Skip stolen memory init if it is fully reserved (Jose) - Use iosys_map for GuC data structures that may be in LMEM BAR or SMEM (Lucas) - Do not complain about stale GuC reset notifications for banned contexts (John) - Move context descriptor fields to intel_lrc.h - Start adding support for small BAR (Matt A) - Clarify vma lifetime (Thomas) - Simplify subplatform detection on TGL (Jose) - Correct the param count for unset GuC SLPC param (Vinay, Umesh) - Read RP_STATE_CAP correctly on Gen12 with GuC SLPC (Vinay) - Initialize GuC submission locks and queues early (Daniele) - Fix GuC flag query helper function to not modify state (John) - Drop fake lmem support now we have real hardware available (Lucas) - Move misplaced W/A to their correct locations (Srinivasan) - Use get_reset_domain() helper (Tejas) - Move context descriptor fields to intel_lrc.h (Matt R) - Selftest improvements (Matt A)

Dave Airlie committed 4 years ago

Commit 2ab82ef2 parents c9e9ce0 b20060671 files · +2318 −627Browse files

Showing the changes to include/uapi (1 of 71 files). Show all

Unified · Split

include/uapi/drm/i915_drm.h+40−5
@@ -1118,10 +1118,16 @@ struct drm_i915_gem_exec_object2 { · 1117 unmodified lines
1118 /**1118 /**
1119 * When the EXEC_OBJECT_PINNED flag is specified this is populated by1119 * When the EXEC_OBJECT_PINNED flag is specified this is populated by
1120 * the user with the GTT offset at which this object will be pinned.1120 * the user with the GTT offset at which this object will be pinned.
1121 *
1121 * When the I915_EXEC_NO_RELOC flag is specified this must contain the1122 * When the I915_EXEC_NO_RELOC flag is specified this must contain the
1122 * presumed_offset of the object.1123 * presumed_offset of the object.
1124 *
1123 * During execbuffer2 the kernel populates it with the value of the1125 * During execbuffer2 the kernel populates it with the value of the
1124 * current GTT offset of the object, for future presumed_offset writes.1126 * current GTT offset of the object, for future presumed_offset writes.
1127 *
1128 * See struct drm_i915_gem_create_ext for the rules when dealing with
1129 * alignment restrictions with I915_MEMORY_CLASS_DEVICE, on devices with
1130 * minimum page sizes, like DG2.
1125 */1131 */
1126 __u64 offset;1132 __u64 offset;
1127 1133
@@ -3144,11 +3150,40 @@ struct drm_i915_gem_create_ext { · 2016 unmodified lines
3144 *3150 *
3145 * The (page-aligned) allocated size for the object will be returned.3151 * The (page-aligned) allocated size for the object will be returned.
3146 *3152 *
3147 * Note that for some devices we have might have further minimum3153 *
3148 * page-size restrictions(larger than 4K), like for device local-memory.3154 * DG2 64K min page size implications:
3149 * However in general the final size here should always reflect any3155 *
3150 * rounding up, if for example using the I915_GEM_CREATE_EXT_MEMORY_REGIONS3156 * On discrete platforms, starting from DG2, we have to contend with GTT
3151 * extension to place the object in device local-memory.3157 * page size restrictions when dealing with I915_MEMORY_CLASS_DEVICE
3158 * objects. Specifically the hardware only supports 64K or larger GTT
3159 * page sizes for such memory. The kernel will already ensure that all
3160 * I915_MEMORY_CLASS_DEVICE memory is allocated using 64K or larger page
3161 * sizes underneath.
3162 *
3163 * Note that the returned size here will always reflect any required
3164 * rounding up done by the kernel, i.e 4K will now become 64K on devices
3165 * such as DG2.
3166 *
3167 * Special DG2 GTT address alignment requirement:
3168 *
3169 * The GTT alignment will also need to be at least 2M for such objects.
3170 *
3171 * Note that due to how the hardware implements 64K GTT page support, we
3172 * have some further complications:
3173 *
3174 * 1) The entire PDE (which covers a 2MB virtual address range), must
3175 * contain only 64K PTEs, i.e mixing 4K and 64K PTEs in the same
3176 * PDE is forbidden by the hardware.
3177 *
3178 * 2) We still need to support 4K PTEs for I915_MEMORY_CLASS_SYSTEM
3179 * objects.
3180 *
3181 * To keep things simple for userland, we mandate that any GTT mappings
3182 * must be aligned to and rounded up to 2MB. The kernel will internally
3183 * pad them out to the next 2MB boundary. As this only wastes virtual
3184 * address space and avoids userland having to copy any needlessly
3185 * complicated PDE sharing scheme (coloring) and only affects DG2, this
3186 * is deemed to be a good compromise.
3152 */3187 */
3153 __u64 size;3188 __u64 size;
3154 /**3189 /**

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