History

Merge tag 'drm-next-2026-08-20' of https://gitlab.freedesktop.org/drm/kernel

Pull drm updates from Dave Airlie: "Highlights: - dmemcg eviction support is good for low VRAM things like Steam Machine - AMD adds gfx6-8 modifier support for older GPUs that enables a bunch of wayland stuff - i915/xe has some new hw support but also a lot of display refactoring Everything: perf: - export perf_allow_ APIs for xe udmabuf: - remove default size limit of 64MB rust: - i/o rework (signed tag from driver-core tree) - add registration guard and registration data - fix unbounded lifetimes in ioctl handler args - fix a drm_dev_register race - gem_shmem: add DmaResvGuard helper - gpuvm: require send/sync for driver data - implement send/sync for GpuVaAlloc and GpuVmBo - add SmContext lifetime - rename dma_handle to dma_address - change pci_sriov_get_totalvfs return to unsigned int core: - create drm_of_get_panel_orientation - send per-connector hotplug events - add thunderbolt UBHR tunneling support connector: - add color format property dmem: - introduce a peak file - accept one region per limit - add dmemcg support for eviction gpusvm: - reorg code to give drivers more flexibility atomic: - add create_state callback and helper - add documentation on atomic commit lifetime buddy: - add per-order free - add used block scoreboard - fix UAF - test buffer clearance on resume - add phys_addr->block helper gem: - drop DRIVER_GEM_GPUVA flag ttm: - be more aggressive allocating below protection limit sched: - add test suite for concurrent job submissions hdmi: - hook the color format property in helpers mipi-dsi: - add MIPI_DSI_MODE_DSC_ALL_SLICES_IN_PKT bridge: - add atomic create callbacks - drop atomic reset - display-connector: don't autoenable HPD IRQ - trigger initial HPD for DP - ti-sn65dsi83: remove NO_HFP and NO_HBP mode flags - analogix_dp: switch to DP link training helpers dp: - add support for DSC max delta BPP edid: - parse panel type from DisplayID 2.x Display Parameters sysfb: - improve panel, stride, framebuffer size validation panel: - implement ref counting for struct drm_panel - himax-hx83121a: add backlight regulator support - novatek-nt36672a: Inline panel init sequences - visionox-vtdr6130: enable DSC - novatek-nt37801: Use mipi_dsi_*_multi() functions - samsung-s6d16d0: Fix prepare error handling - support Novatek NT36536 plus DT bindings - sofef00: fix backlight updates - osd101t2587: use mipi_dsi_*_multi interface - panel-edp: adjust timing for AUO displays - panel-lvds: support Opto Logic SCX1001511GGC49 - panel-simple: support Kyocera tcg070wvlq - panel-edp: quirks - AUO B116XAT04.3, CMN N116BCP-EA2, CSW MNB601LS1-8 - BOE NV116WH2-M30, BOE NT116WHM-N21, BOE NV116FH1-M31 - BOE NV116FH1-M30, NV140FHM-N5B, TM156VDXP25 - BOE NE160QDM-NY1, MB116AS01 - new: - Samsung ATNA40HQ08-0, Anbernic TD4310 - Chipone ICNA35XX, Ilitek ILI9488 - Ilitek ILI7807S, Renesas R63419 - MNE001BS6-2, MNF601BS4-1, Sharp LQ120P1JX51 virtio: - add support for save/restore virtio_gpu_objects - abort vq wait on device removal amdgpu: - add color format DRM property - initial compute pipe reset support - add GFX 6-8 modifier support - initial DCN 6.0.0 support - dmemcg eviction support - improved boundary checking for bios parsing - RAS updates and rework - VCN secure submission fixes - 8K panel fix - Display KUNIT tests - parse panel type from DisplayID - Align IP discovery to pci device lifetime - SOC15 register macro cleanups - UVD memory placement fixes - GFX9 mode2 reset fixes - drop unnecessary BUG/BUG_ON - GFX8 soft reset rework - enable soft reset on GFX8 - PSP/SMU 15.0.9 update - VI ASPM fix - userq fixes - amdgpu_vm_get_task_info_pasid lifetime fix - DC CACP support - change system_unbound_wq with system_dfl_wq - Loosen VFCT bios parsing to deal with pci=realloc - SI/SMU7 AC/DC switch fix - VM fence handling fix - GEM close optimisation - Apple Studio Display fixes - DC FRL fixes amdkfd: - initial compute pipe reset support - allow applications to opt out of sigbus on fatal errors - improve CRIU boundary checks - MQD handling rework - move TBA/TMA from system to device memory - avoid topology-lock in kfd_mmap - SVM eviction fixes radeon: - fix unset CONFIG_ACPI build i915: - Novalake (NVL display version 35) timing generator enabling - NVL DC3CO enabling - enable UBHR link rates on thunderbolt tunnels - Reduce Xe3+ PM demand peak bandwidth - enable pipe DMC error interrupts for display 30+ - add kunit tests for DP link config selection - refactor and document DP link recovery - i915/xe driver display probe/remove/suspend/resume/shutdown cleanup and unification - i915/xe display runtime PM unified - Break i915 and xe panic dependency on struct intel_framebuffer - Streamline Pre/Post-CSC LUT loops - drop TGL DC3DO support - CDCLK santization - fix HDMI scrambling enable - fix phys bo pread/pwrite with offset - add missing nospec on parallel submit slot - fix some NULL derefs xe: - drop force_execlist module param - gate observation streams with perf_allow_cpu - skip FORCE_WC and vm_bound check for external dma-bufs - dmemcg eviction support - remove unused NVL-S GuC - TLB invalidation improvements - NVL-S updated PCI-IDs and w/a - madvise: optimise invalidation path - fix infinite gt-reset loop in timeout recovery - update TTM device benefical_order - wait on external BO kernel fences in exec ioctl - add/use more KLV helpers - sriov: disable display in admin only PF mode - add RAS GPU health indicator - optimise TTM populate for DONTNEED BO - drop force_probe for NVL-s - add debugfs for pcode info amdxdna: - disable device buffer export nova: - build nova-core/nova-drm from drivers/gpu - export nova-core rust symbols (workaround) - GSP boot process consolidation - Boot GSP with vGPU enabled - TLV firmware image format support - Hopper/Blackwell fixes and cleanups - I/O projection adoption tyr: - firmware loading and MCU boot - add generic slot manager + MMU - GPU VM support ARM64 LPAE page tables - add kernel buffer object for internal allocations - add parser for Mali CSF - add MCU booting nouveau: - race fixes - check instmem iomapping at first use - add dmemcg support - expose NVDEC channels - add scanline position/head state support for GSP qxl: - convert simple encoder to regular ethosu: - add perf counter support etnaviv: - force flush on power register ops msm: - support DSC configuration with slice_per_pkt > 1 mxsfb: - fix disable sequence panthor: - support sparse mappings rockchip: - switch away from simple helpers - support YUV background color - fix layer config timeout - add edp support for rk3576 - add batch command submission function rocket: - error handling and NULL ptr deref fixes sun4i: - switch away from simple helpers imagination: - mark BXM-4-64 MC1 as support host1x: - support tegra264 tegra: - add DSI for tegra 20/30 v3d: - reduce PM runtime autosuspend delay - scheduler fixes and refactoring - deprecate v3d 3.3 and 4.1 - validate CPU job query boundaries hibmc: - improve plane format handling - switch to gem shmem mediatek: - cec: correct compat for mt7623-8167? exynos: - remove simple dependency - add error handling to encoder paths - take i2c adapter module reference" * tag 'drm-next-2026-08-20' of https://gitlab.freedesktop.org/drm/kernel: (2074 commits) drm/xe/mcr: Take vcs1/vecs1 into account for first media slice drm/xe: Fix a bug in pc_adjust_freq_bounds() drm/xe: Fix xe_device_probe() failure drm/xe/drm_ras: Move has_drm_ras check to drm_ras layer drm/xe/ras: Fix boot-time ras error processing drm/amd/display: make DC_RUN_WITH_PREEMPTION_ENABLED misuse a build error drm/amd/pm: silence uninitialized variable warnings drm/amdgpu: skip BOs being torn down during GTT recovery drm/amdgpu: Reject UVD message with invalid number of h265 refs drm/amdgpu: keep PRT mappings off the vm_bo state lists drm/amdgpu: fix nbif 6.3.1 l1 low power not functional drm/amd/display: fix BT.2020 YCbCr output CSC matrices for DCE drm/amd/display: fix BT.2020 YCbCr limited output CSC matrix drm/amdgpu: Implement insert_end for VCE 3 drm/amdgpu: Fix UVD min buffer sizes drm/amdgpu: Fix UVD decode image min size calculation drm/amdgpu: Fix UVD dpb min size calculation for H264 drm/amdgpu: Reject UVD message with dimensions above 4096 drm/amdgpu: check ASPM on the dGPU host link drm/radeon: fix autosuspend cleanup during teardown ...

Linus Torvalds committed 2 months ago

Commit 4e69c182 parents 818bebe c44e2781576 files · +231951 −42056Browse files

Showing the changes to include/uapi (8 of 1576 files). Show all

Unified · Split

8 files
  1. include/uapi/drm/amdgpu_drm.h +21 −0
  2. include/uapi/drm/drm_fourcc.h +191 −18
  3. include/uapi/drm/drm_mode.h +1 −0
  4. include/uapi/drm/ethosu_accel.h +59 −1
  5. include/uapi/drm/nouveau_drm.h +1 −0
  6. include/uapi/drm/panthor_drm.h +25 −1
  7. include/uapi/drm/xe_drm.h +13 −4
  8. include/uapi/linux/kfd_ioctl.h +89 −91
include/uapi/drm/amdgpu_drm.h+21−0
@@ -58,6 +58,7 @@ extern "C" { · 57 unmodified lines
5858 #define DRM_AMDGPU_USERQ_SIGNAL 0x17
5959 #define DRM_AMDGPU_USERQ_WAIT 0x18
6060 #define DRM_AMDGPU_GEM_LIST_HANDLES 0x19
61+#define DRM_AMDGPU_PROC_OPTIONS 0x1A
6162
6263 #define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
6364 #define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -79,6 +80,7 @@ extern "C" { · 15 unmodified lines
7980 #define DRM_IOCTL_AMDGPU_USERQ_SIGNAL DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_SIGNAL, struct drm_amdgpu_userq_signal)
8081 #define DRM_IOCTL_AMDGPU_USERQ_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait)
8182 #define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)
83+#define DRM_IOCTL_AMDGPU_PROC_OPTIONS DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_PROC_OPTIONS, struct drm_amdgpu_proc_options)
8284
8385 /**
8486 * DOC: memory domains
@@ -1673,6 +1675,25 @@ struct drm_amdgpu_info_uq_metadata { · 1588 unmodified lines
16731675 #define AMDGPU_FAMILY_GC_11_5_4 154 /* GC 11.5.4 */
16741676 #define AMDGPU_FAMILY_GC_12_0_0 152 /* GC 12.0.0 */
16751677
1678+/*
1679+ * Definition of user options
1680+ *
1681+ * option: AMDGPU_PROC_OPTIONS_OP_KFD_SIGBUS_DELAY
1682+ * 0: Disable sigbus delay - SIGBUS will be raised immediately
1683+ * 0xFFFFFFFF: SIGBUS will not be raised
1684+ * other: Set the sigbus delay in milliseconds
1685+ */
1686+#define AMDGPU_PROC_OPTIONS_OP_KFD_SIGBUS_DELAY 0
1687+
1688+#define AMDGPU_PROC_OPTIONS_KFD_SIGBUS_DELAY_DISABLED 0xFFFFFFFFu
1689+
1690+struct drm_amdgpu_proc_options {
1691+ __u32 op;
1692+ struct {
1693+ __u32 value;
1694+ } kfd_sigbus_delay;
1695+};
1696+
16761697 #if defined(__cplusplus)
16771698 }
16781699 #endif
include/uapi/drm/drm_fourcc.h+191−18
@@ -1646,36 +1646,69 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 1645 unmodified lines
16461646 * For multi-plane formats the above surfaces get merged into one plane for
16471647 * each format plane, based on the required alignment only.
16481648 *
1649− * Bits Parameter Notes
1650− * ----- ------------------------ ---------------------------------------------
1649+ * Bits Parameter Notes
1650+ * ------- ------------------------ ---------------------------------------------
1651+ *
1652+ * DRM format modifier fields on AMD GPUs:
1653+ * 7:0 TILE_VERSION Values are AMD_FMT_MOD_TILE_VER_*
1654+ * 12:8 TILE Values are AMD_FMT_MOD_TILE_<version>_*
1655+ * 13 DCC Delta Color Compression, supported on GFX8 and newer
1656+ * 55:14 (chip specific) See below for details, depends on GFX block version
1657+ * 63:56 Vendor Value is DRM_FORMAT_MOD_VENDOR_AMD
1658+ *
1659+ * Chip specific fields on Gfx9 and newer:
1660+ * 14 DCC_RETILE
1661+ * 15 DCC_PIPE_ALIGN
1662+ * 16 DCC_INDEPENDENT_64B
1663+ * 17 DCC_INDEPENDENT_128B
1664+ * 19:18 DCC_MAX_COMPRESSED_BLOCK Values are AMD_FMT_MOD_DCC_BLOCK_*
1665+ * 20 DCC_CONSTANT_ENCODE
1666+ * 23:21 PIPE_XOR_BITS Only for some chips
1667+ * 26:24 BANK_XOR_BITS Only for some chips
1668+ * 29:27 PACKERS Only for some chips
1669+ * 32:30 RB Only for some chips
1670+ * 35:33 PIPE Only for some chips
1671+ * 55:36 - Reserved for future use, must be zero
1672+ *
1673+ * Chip specific fields on Gfx6-8:
1674+ * 16:14 MICROTILE Micro tile format
1675+ * 21:17 PIPE_CONFIG Number of pipes and how pipes are interleaved
1676+ * 24:22 TILE_SPLIT Tile split size
1677+ * 26:25 BANK_WIDTH Number of tiles in the X direction in the same bank
1678+ * 28:27 BANK_HEIGHT Number of tiles in the Y direction in the same bank
1679+ * 30:29 MACRO_TILE_ASPECT Macro tile aspect ratio
1680+ * 32:31 NUM_BANKS Number of banks
1681+ * 55:33 - Reserved for future use, must be zero
16511682 *
1652− * 7:0 TILE_VERSION Values are AMD_FMT_MOD_TILE_VER_*
1653− * 12:8 TILE Values are AMD_FMT_MOD_TILE_<version>_*
1654− * 13 DCC
1655− * 14 DCC_RETILE
1656− * 15 DCC_PIPE_ALIGN
1657− * 16 DCC_INDEPENDENT_64B
1658− * 17 DCC_INDEPENDENT_128B
1659− * 19:18 DCC_MAX_COMPRESSED_BLOCK Values are AMD_FMT_MOD_DCC_BLOCK_*
1660− * 20 DCC_CONSTANT_ENCODE
1661− * 23:21 PIPE_XOR_BITS Only for some chips
1662− * 26:24 BANK_XOR_BITS Only for some chips
1663− * 29:27 PACKERS Only for some chips
1664− * 32:30 RB Only for some chips
1665− * 35:33 PIPE Only for some chips
1666− * 55:36 - Reserved for future use, must be zero
16671683 */
16681684 #define AMD_FMT_MOD fourcc_mod_code(AMD, 0)
16691685
16701686 #define IS_AMD_FMT_MOD(val) (((val) >> 56) == DRM_FORMAT_MOD_VENDOR_AMD)
16711687
1672−/* Reserve 0 for GFX8 and older */
1688+#define AMD_FMT_MOD_TILE_VER_GFX6 0
16731689 #define AMD_FMT_MOD_TILE_VER_GFX9 1
16741690 #define AMD_FMT_MOD_TILE_VER_GFX10 2
16751691 #define AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS 3
16761692 #define AMD_FMT_MOD_TILE_VER_GFX11 4
16771693 #define AMD_FMT_MOD_TILE_VER_GFX12 5
16781694
1695+/*
1696+ * Gfx6-8 tiling modes.
1697+ * A complete reference implementation is found in addrlib in the Mesa code base.
1698+ *
1699+ * - Microtiled modes (1D):
1700+ * Pixel data is organized into micro tiles of 8x8 pixels.
1701+ *
1702+ * - Macrotiled modes (2D):
1703+ * Micro tiles are further organized into macro tiles.
1704+ * These are optimized for even load distribution among memory channels.
1705+ *
1706+ * Note that only THIN1 modes are exposed here.
1707+ * THICK and XTHICK are for 3D images and not relevant to DRM format modifiers.
1708+ */
1709+#define AMD_FMT_MOD_TILE_GFX6_1D_TILED_THIN1 0x2
1710+#define AMD_FMT_MOD_TILE_GFX6_2D_TILED_THIN1 0x4
1711+
16791712 /*
16801713 * 64K_S is the same for GFX9/GFX10/GFX10_RBPLUS and hence has GFX9 as canonical
16811714 * version.
@@ -1774,6 +1807,146 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 92 unmodified lines
17741807 #define AMD_FMT_MOD_PIPE_SHIFT 33
17751808 #define AMD_FMT_MOD_PIPE_MASK 0x7
17761809
1810+/*
1811+ * MICRO_TILE_MODE, 3 bits. Determines the micro tile format.
1812+ * Only relevant to Gfx6-8.
1813+ *
1814+ * DISPLAY - Displayable tiling
1815+ * THIN - Non-displayable tiling, a.k.a thin micro tiling
1816+ * DEPTH, THICK - not exposed, not relevant to DRM format modifier use cases
1817+ * ROTATED - not exposed, not implemented in Linux or Mesa
1818+ */
1819+#define AMD_FMT_MOD_MICROTILE_SHIFT 14ULL
1820+#define AMD_FMT_MOD_MICROTILE_MASK 0x7
1821+
1822+#define AMD_FMT_MOD_MICROTILE_DISPLAY 0x0
1823+#define AMD_FMT_MOD_MICROTILE_THIN 0x1
1824+
1825+/*
1826+ * PIPE_CONFIG, 5 bits. Number of pipes and how pipes are interleaved on the surface,
1827+ * which means the shader engine tile size and packer tile size.
1828+ * Typically matches the number of memory channels, or number of RBs.
1829+ * Only relevant to Gfx6-8 macro tiled modes.
1830+ *
1831+ * P<n>_<a>x<b>_<c>x<d>
1832+ * where:
1833+ * <n> - number of pipes
1834+ * <a>x<b> - shader engine tile size
1835+ * <c>x<d> - packer tile size
1836+ */
1837+#define AMD_FMT_MOD_PIPE_CONFIG_SHIFT 17ULL
1838+#define AMD_FMT_MOD_PIPE_CONFIG_MASK 0x1f
1839+
1840+#define AMD_FMT_MOD_PIPE_CONFIG_P2 0x0
1841+#define AMD_FMT_MOD_PIPE_CONFIG_P4_8x16 0x4
1842+#define AMD_FMT_MOD_PIPE_CONFIG_P4_16x16 0x5
1843+#define AMD_FMT_MOD_PIPE_CONFIG_P4_16x32 0x6
1844+#define AMD_FMT_MOD_PIPE_CONFIG_P4_32x32 0x7
1845+#define AMD_FMT_MOD_PIPE_CONFIG_P8_16x16_8x16 0x8
1846+#define AMD_FMT_MOD_PIPE_CONFIG_P8_16x32_8x16 0x9
1847+#define AMD_FMT_MOD_PIPE_CONFIG_P8_32x32_8x16 0xa
1848+#define AMD_FMT_MOD_PIPE_CONFIG_P8_16x32_16x16 0xb
1849+#define AMD_FMT_MOD_PIPE_CONFIG_P8_32x32_16x16 0xc
1850+#define AMD_FMT_MOD_PIPE_CONFIG_P8_32x32_16x32 0xd
1851+#define AMD_FMT_MOD_PIPE_CONFIG_P8_32x64_32x32 0xe
1852+#define AMD_FMT_MOD_PIPE_CONFIG_P16_32x32_8x16 0x10
1853+#define AMD_FMT_MOD_PIPE_CONFIG_P16_32x32_16x16 0x11
1854+
1855+/*
1856+ * TILE_SPLIT, 3 bits.
1857+ * Only relevant to Gfx6-8 macro tiled modes.
1858+ *
1859+ * On GFX6 (or with depth tiling modes on GFX7 and newer),
1860+ * the GFX block uses the GB_TILE_MODE.TILE_SPLIT field directly.
1861+ *
1862+ * On GFX7 and newer with non-depth tiling modes, the GFX block uses a
1863+ * split factor which is stored in the GB_TILE_MODE.SAMPLE_SPLIT field.
1864+ * SAMPLE_SPLIT may be: 0 - 1 byte; 1 - 2 bytes; 2 - 4 bytes; 3 - 8 bytes.
1865+ * The actual tile size and tile split bytes are calculated as follows:
1866+ *
1867+ * bpp = ... <- bits per pixel in the current image
1868+ * thickness = ... <- depends on array mode; may be: 1, 4, 8
1869+ * num_samples = ... <- number of samples in the current image
1870+ * tile_size_pixels = 8 * 8
1871+ * tile_bytes_1x = thickness * tile_size_pixels * bpp / 8
1872+ * sample_split_factor = 1 << SAMPLE_SPLIT
1873+ * tile_split_bytes = clamp(tile_bytes_1x * sample_split_factor, 256, dram_row_size_bytes)
1874+ * tile_bytes = clamp(tile_bytes_1x * num_samples, 64, tile_split_bytes)
1875+ *
1876+ * In both cases, the display block (DCE) has no SAMPLE_SPLIT
1877+ * and just needs the tile split bytes in the GRPH_CONTROL.GRPH_TILE_SPLIT field.
1878+ * To maximize compatibility between GFX6-7, we don't include the SAMPLE_SPLIT
1879+ * in the format modifiers.
1880+ *
1881+ * The actual tile split in bytes is: 64 << field value
1882+ * Possible values of this field:
1883+ *
1884+ * 0 - Tile split is 64 bytes
1885+ * 1 - Tile split is 128 bytes
1886+ * 2 - Tile split is 256 bytes
1887+ * 3 - Tile split is 512 bytes
1888+ * 4 - Tile split is 1 KiB
1889+ * 5 - Tile split is 2 KiB
1890+ * 6 - Tile split is 4 KiB
1891+ */
1892+#define AMD_FMT_MOD_TILE_SPLIT_SHIFT 22ULL
1893+#define AMD_FMT_MOD_TILE_SPLIT_MASK 0x7
1894+
1895+/*
1896+ * BANK_WIDTH, 2 bits. Number of tiles in the X direction in the same bank.
1897+ * Only relevant to Gfx6-8 macro tiled modes.
1898+ * The actual bank width is: 1 << field value
1899+ * Possible values:
1900+ *
1901+ * 0 - bank width is 1
1902+ * 1 - bank width is 2
1903+ * 2 - bank width is 4
1904+ * 3 - bank width is 8
1905+ */
1906+#define AMD_FMT_MOD_BANK_WIDTH_SHIFT 25ULL
1907+#define AMD_FMT_MOD_BANK_WIDTH_MASK 0x3
1908+
1909+/*
1910+ * BANK_HEIGHT, 2 bits. Number of tiles in the Y direction in the same bank.
1911+ * Only relevant to Gfx6-8 macro tiled modes.
1912+ * The actual bank height is: 1 << field value
1913+ * Possible values:
1914+ *
1915+ * 0 - bank height is 1
1916+ * 1 - bank height is 2
1917+ * 2 - bank height is 4
1918+ * 3 - bank height is 8
1919+ */
1920+#define AMD_FMT_MOD_BANK_HEIGHT_SHIFT 27ULL
1921+#define AMD_FMT_MOD_BANK_HEIGHT_MASK 0x3
1922+
1923+/*
1924+ * MACRO_TILE_ASPECT, 2 bits. Macro tile aspect ratio.
1925+ * Only relevant to Gfx6-8 macro tiled modes.
1926+ * Possible values:
1927+ *
1928+ * 0 - aspect ratio is 1:1
1929+ * 1 - aspect ratio is 4:1
1930+ * 2 - aspect ratio is 16:1
1931+ * 3 - aspect ratio is 64:1
1932+ */
1933+#define AMD_FMT_MOD_MACRO_TILE_ASPECT_SHIFT 29ULL
1934+#define AMD_FMT_MOD_MACRO_TILE_ASPECT_MASK 0x3
1935+
1936+/*
1937+ * NUM_BANKS, 2 bits. Number of banks.
1938+ * Only relevant to Gfx6-8 macro tiled modes.
1939+ * The actual number of banks is: 2 << field value
1940+ * Possible values:
1941+ *
1942+ * 0 - number of banks is 2
1943+ * 1 - number of banks is 4
1944+ * 2 - number of banks is 8
1945+ * 3 - number of banks is 16
1946+ */
1947+#define AMD_FMT_MOD_NUM_BANKS_SHIFT 31ULL
1948+#define AMD_FMT_MOD_NUM_BANKS_MASK 0x3
1949+
17771950 #define AMD_FMT_MOD_SET(field, value) \
17781951 ((__u64)(value) << AMD_FMT_MOD_##field##_SHIFT)
17791952 #define AMD_FMT_MOD_GET(field, value) \
include/uapi/drm/drm_mode.h+1−0
@@ -155,6 +155,7 @@ extern "C" { · 154 unmodified lines
155155 /* Panel type property */
156156 #define DRM_MODE_PANEL_TYPE_UNKNOWN 0
157157 #define DRM_MODE_PANEL_TYPE_OLED 1
158+#define DRM_MODE_PANEL_TYPE_LCD 2
158159
159160 /*
160161 * DRM_MODE_ROTATE_<degrees>
include/uapi/drm/ethosu_accel.h+59−1
@@ -43,6 +43,11 @@ enum drm_ethosu_ioctl_id { · 42 unmodified lines
4343
4444 /** @DRM_ETHOSU_SUBMIT: Submit a job and BOs to run. */
4545 DRM_ETHOSU_SUBMIT,
46+
47+ DRM_ETHOSU_PERFMON_CREATE,
48+ DRM_ETHOSU_PERFMON_DESTROY,
49+ DRM_ETHOSU_PERFMON_GET_VALUES,
50+ DRM_ETHOSU_PERFMON_SET_GLOBAL,
4651 };
4752
4853 /**
@@ -79,6 +84,7 @@ struct drm_ethosu_npu_info { · 30 unmodified lines
7984 __u32 config;
8085
8186 __u32 sram_size;
87+ __u32 pmu_counters;
8288 };
8389
8490 /**
@@ -220,10 +226,54 @@ struct drm_ethosu_submit { · 135 unmodified lines
220226 /** Input: Number of jobs passed in. */
221227 __u32 job_count;
222228
223− /** Reserved, must be zero. */
229+ /** Input: Id returned by DRM_ETHOSU_PERFMON_CREATE */
230+ __u32 perfmon_id;
231+};
232+
233+#define DRM_ETHOSU_MAX_PERF_EVENT_COUNTERS 8
234+#define DRM_ETHOSU_MAX_PERF_COUNTERS \
235+ (DRM_ETHOSU_MAX_PERF_EVENT_COUNTERS + 1)
236+
237+struct drm_ethosu_perfmon_create {
238+ __u32 id;
239+ __u32 ncounters;
240+ __u16 counters[DRM_ETHOSU_MAX_PERF_EVENT_COUNTERS];
241+};
242+
243+struct drm_ethosu_perfmon_destroy {
244+ __u32 id;
224245 __u32 pad;
225246 };
226247
248+/*
249+ * Returns the values of the performance counters tracked by this
250+ * perfmon (as an array of (ncounters + 1) u64 values).
251+ *
252+ * No implicit synchronization is performed, so the user has to
253+ * guarantee that any jobs using this perfmon have already been
254+ * completed.
255+ */
256+struct drm_ethosu_perfmon_get_values {
257+ __u32 id;
258+ __u32 pad;
259+ __u64 values_ptr;
260+};
261+
262+#define DRM_ETHOSU_PERFMON_CLEAR_GLOBAL 0x0001
263+
264+/**
265+ * struct drm_ethosu_perfmon_set_global - ioctl to define a global performance
266+ * monitor
267+ *
268+ * The global performance monitor will be used for all jobs. If a global
269+ * performance monitor is defined, jobs with a self-defined performance
270+ * monitor won't be allowed.
271+ */
272+struct drm_ethosu_perfmon_set_global {
273+ __u32 flags;
274+ __u32 id;
275+};
276+
227277 /**
228278 * DRM_IOCTL_ETHOSU() - Build a ethosu IOCTL number
229279 * @__access: Access type. Must be R, W or RW.
@@ -252,6 +302,14 @@ enum { · 22 unmodified lines
252302 DRM_IOCTL_ETHOSU(WR, CMDSTREAM_BO_CREATE, cmdstream_bo_create),
253303 DRM_IOCTL_ETHOSU_SUBMIT =
254304 DRM_IOCTL_ETHOSU(WR, SUBMIT, submit),
305+ DRM_IOCTL_ETHOSU_PERFMON_CREATE =
306+ DRM_IOCTL_ETHOSU(WR, PERFMON_CREATE, perfmon_create),
307+ DRM_IOCTL_ETHOSU_PERFMON_DESTROY =
308+ DRM_IOCTL_ETHOSU(WR, PERFMON_DESTROY, perfmon_destroy),
309+ DRM_IOCTL_ETHOSU_PERFMON_GET_VALUES =
310+ DRM_IOCTL_ETHOSU(WR, PERFMON_GET_VALUES, perfmon_get_values),
311+ DRM_IOCTL_ETHOSU_PERFMON_SET_GLOBAL =
312+ DRM_IOCTL_ETHOSU(WR, PERFMON_SET_GLOBAL, perfmon_set_global),
255313 };
256314
257315 #if defined(__cplusplus)
include/uapi/drm/nouveau_drm.h+1−0
@@ -89,6 +89,7 @@ struct drm_nouveau_getparam { · 88 unmodified lines
8989 #define NOUVEAU_FIFO_ENGINE_PPP 0x04
9090 #define NOUVEAU_FIFO_ENGINE_BSP 0x08
9191 #define NOUVEAU_FIFO_ENGINE_CE 0x30
92+#define NOUVEAU_FIFO_ENGINE_NVDEC 0x300
9293
9394 struct drm_nouveau_channel_alloc {
9495 __u32 fb_ctxdma_handle;
include/uapi/drm/panthor_drm.h+25−1
@@ -253,6 +253,9 @@ enum drm_panthor_dev_query_type { · 252 unmodified lines
253253 * @DRM_PANTHOR_DEV_QUERY_GROUP_PRIORITIES_INFO: Query allowed group priorities information.
254254 */
255255 DRM_PANTHOR_DEV_QUERY_GROUP_PRIORITIES_INFO,
256+
257+ /** @DRM_PANTHOR_DEV_QUERY_MMU_INFO: Query MMU information. */
258+ DRM_PANTHOR_DEV_QUERY_MMU_INFO,
256259 };
257260
258261 /**
@@ -487,6 +490,16 @@ struct drm_panthor_timestamp_info { · 228 unmodified lines
487490 __u64 cpu_timestamp_nsec;
488491 };
489492
493+/**
494+ * struct drm_panthor_mmu_info - MMU information
495+ *
496+ * Structure grouping all queryable information relating to the MMU.
497+ */
498+struct drm_panthor_mmu_info {
499+ /** @page_size_bitmap: Allowed page sizes */
500+ __u64 page_size_bitmap;
501+};
502+
490503 /**
491504 * struct drm_panthor_group_priorities_info - Group priorities information
492505 *
@@ -601,6 +614,18 @@ enum drm_panthor_vm_bind_op_flags { · 108 unmodified lines
601614 */
602615 DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED = 1 << 2,
603616
617+ /**
618+ * @DRM_PANTHOR_VM_BIND_OP_MAP_SPARSE: Sparsely map a virtual memory range
619+ *
620+ * Only valid with DRM_PANTHOR_VM_BIND_OP_TYPE_MAP.
621+ *
622+ * When this flag is set, the whole vm_bind range is mapped over a dummy object in a cyclic
623+ * fashion, and all GPU reads from addresses in the range return undefined values. This flag
624+ * being set means drm_panthor_vm_bind_op::bo_offset and drm_panthor_vm_bind_op::bo_handle
625+ * must both be set to 0. DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC must also be set.
626+ */
627+ DRM_PANTHOR_VM_BIND_OP_MAP_SPARSE = 1 << 3,
628+
604629 /**
605630 * @DRM_PANTHOR_VM_BIND_OP_TYPE_MASK: Mask used to determine the type of operation.
606631 */
@@ -664,7 +689,6 @@ struct drm_panthor_vm_bind_op { · 57 unmodified lines
664689 * This array shall not be empty for sync-only operations.
665690 */
666691 struct drm_panthor_obj_array syncs;
667−
668692 };
669693
670694 /**
include/uapi/drm/xe_drm.h+13−4
@@ -2537,21 +2537,21 @@ struct drm_xe_exec_queue_set_property { · 2536 unmodified lines
25372537 * Refer to Documentation/netlink/specs/drm_ras.yaml for complete interface specification.
25382538 *
25392539 * Node Registration
2540− * =================
2540+ * -----------------
25412541 *
25422542 * The driver registers DRM RAS nodes for each error severity level.
25432543 * enum drm_xe_ras_error_severity defines the node-id, while DRM_XE_RAS_ERROR_SEVERITY_NAMES maps
25442544 * node-id to node-name.
25452545 *
25462546 * Error Classification
2547− * ====================
2547+ * --------------------
25482548 *
25492549 * Each node contains a list of error counters. Each error is identified by a error-id and
25502550 * an error-name. enum drm_xe_ras_error_component defines the error-id, while
25512551 * DRM_XE_RAS_ERROR_COMPONENT_NAMES maps error-id to error-name.
25522552 *
25532553 * User Interface
2554− * ==============
2554+ * --------------
25552555 *
25562556 * To retrieve error values of a error counter, userspace applications should
25572557 * follow the below steps:
@@ -2589,6 +2589,12 @@ enum drm_xe_ras_error_component { · 31 unmodified lines
25892589 DRM_XE_RAS_ERR_COMP_CORE_COMPUTE = 1,
25902590 /** @DRM_XE_RAS_ERR_COMP_SOC_INTERNAL: SoC Internal Error */
25912591 DRM_XE_RAS_ERR_COMP_SOC_INTERNAL,
2592+ /** @DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY: Device Memory Error */
2593+ DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY,
2594+ /** @DRM_XE_RAS_ERR_COMP_PCIE: PCIe Subsystem Error */
2595+ DRM_XE_RAS_ERR_COMP_PCIE,
2596+ /** @DRM_XE_RAS_ERR_COMP_FABRIC: Fabric Subsystem Error */
2597+ DRM_XE_RAS_ERR_COMP_FABRIC,
25922598 /** @DRM_XE_RAS_ERR_COMP_MAX: Max Error */
25932599 DRM_XE_RAS_ERR_COMP_MAX /* non-ABI */
25942600 };
@@ -2606,7 +2612,10 @@ enum drm_xe_ras_error_component { · 11 unmodified lines
26062612 */
26072613 #define DRM_XE_RAS_ERROR_COMPONENT_NAMES { \
26082614 [DRM_XE_RAS_ERR_COMP_CORE_COMPUTE] = "core-compute", \
2609− [DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal" \
2615+ [DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal", \
2616+ [DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY] = "device-memory", \
2617+ [DRM_XE_RAS_ERR_COMP_PCIE] = "pcie", \
2618+ [DRM_XE_RAS_ERR_COMP_FABRIC] = "fabric", \
26102619 }
26112620
26122621 #if defined(__cplusplus)
include/uapi/linux/kfd_ioctl.h+89−91
@@ -690,7 +690,7 @@ enum kfd_criu_op { · 689 unmodified lines
690690 };
691691
692692 /**
693− * kfd_ioctl_criu_args - Arguments perform CRIU operation
693+ * struct kfd_ioctl_criu_args - Arguments perform CRIU operation
694694 * @devices: [in/out] User pointer to memory location for devices information.
695695 * This is an array of type kfd_criu_device_bucket.
696696 * @bos: [in/out] User pointer to memory location for BOs information
@@ -698,11 +698,11 @@ enum kfd_criu_op { · 1 unmodified line
698698 * @priv_data: [in/out] User pointer to memory location for private data
699699 * @priv_data_size: [in/out] Size of priv_data in bytes
700700 * @num_devices: [in/out] Number of GPUs used by process. Size of @devices array.
701− * @num_bos [in/out] Number of BOs used by process. Size of @bos array.
701+ * @num_bos: [in/out] Number of BOs used by process. Size of @bos array.
702702 * @num_objects: [in/out] Number of objects used by process. Objects are opaque to
703703 * user application.
704704 * @pid: [in/out] PID of the process being checkpointed
705− * @op [in] Type of operation (kfd_criu_op)
705+ * @op: [in] Type of operation (kfd_criu_op)
706706 *
707707 * Return: 0 on success, -errno on failure
708708 */
@@ -764,7 +764,7 @@ enum kfd_mmio_remap { · 55 unmodified lines
764764 #define KFD_IOCTL_SVM_FLAG_EXT_COHERENT 0x00000080
765765
766766 /**
767− * kfd_ioctl_svm_op - SVM ioctl operations
767+ * enum kfd_ioctl_svm_op - SVM ioctl operations
768768 *
769769 * @KFD_IOCTL_SVM_OP_SET_ATTR: Modify one or more attributes
770770 * @KFD_IOCTL_SVM_OP_GET_ATTR: Query one or more attributes
@@ -786,7 +786,7 @@ enum kfd_ioctl_svm_location { · 15 unmodified lines
786786 };
787787
788788 /**
789− * kfd_ioctl_svm_attr_type - SVM attribute types
789+ * enum kfd_ioctl_svm_attr_type - SVM attribute types
790790 *
791791 * @KFD_IOCTL_SVM_ATTR_PREFERRED_LOC: gpuid of the preferred location, 0 for
792792 * system memory
@@ -815,7 +815,7 @@ enum kfd_ioctl_svm_attr_type { · 22 unmodified lines
815815 };
816816
817817 /**
818− * kfd_ioctl_svm_attribute - Attributes as pairs of type and value
818+ * struct kfd_ioctl_svm_attribute - Attributes as pairs of type and value
819819 *
820820 * The meaning of the @value depends on the attribute type.
821821 *
@@ -828,7 +828,7 @@ struct kfd_ioctl_svm_attribute { · 6 unmodified lines
828828 };
829829
830830 /**
831− * kfd_ioctl_svm_args - Arguments for SVM ioctl
831+ * struct kfd_ioctl_svm_args - Arguments for SVM ioctl
832832 *
833833 * @op specifies the operation to perform (see enum
834834 * @kfd_ioctl_svm_op). @start_addr and @size are common for all
@@ -875,7 +875,7 @@ struct kfd_ioctl_svm_args { · 40 unmodified lines
875875 };
876876
877877 /**
878− * kfd_ioctl_set_xnack_mode_args - Arguments for set_xnack_mode
878+ * struct kfd_ioctl_set_xnack_mode_args - Arguments for set_xnack_mode
879879 *
880880 * @xnack_enabled: [in/out] Whether to enable XNACK mode for this process
881881 *
@@ -1055,15 +1055,15 @@ struct kfd_runtime_info { · 173 unmodified lines
10551055 #define KFD_RUNTIME_ENABLE_MODE_TTMP_SAVE_MASK 2
10561056
10571057 /**
1058− * kfd_ioctl_runtime_enable_args - Arguments for runtime enable
1058+ * struct kfd_ioctl_runtime_enable_args - Arguments for runtime enable
10591059 *
10601060 * Coordinates debug exception signalling and debug device enablement with runtime.
10611061 *
1062− * @r_debug - pointer to user struct for sharing information between ROCr and the debuggger
1063− * @mode_mask - mask to set mode
1062+ * @r_debug: pointer to user struct for sharing information between ROCr and the debuggger
1063+ * @mode_mask: mask to set mode
10641064 * KFD_RUNTIME_ENABLE_MODE_ENABLE_MASK - enable runtime for debugging, otherwise disable
10651065 * KFD_RUNTIME_ENABLE_MODE_TTMP_SAVE_MASK - enable trap temporary setup (ignore on disable)
1066− * @capabilities_mask - mask to notify runtime on what KFD supports
1066+ * @capabilities_mask: mask to notify runtime on what KFD supports
10671067 *
10681068 * Return - 0 on SUCCESS.
10691069 * - EBUSY if runtime enable call already pending.
@@ -1158,17 +1158,15 @@ enum kfd_dbg_trap_operations { · 88 unmodified lines
11581158 };
11591159
11601160 /**
1161− * kfd_ioctl_dbg_trap_enable_args
1162− *
1163− * Arguments for KFD_IOC_DBG_TRAP_ENABLE.
1161+ * struct kfd_ioctl_dbg_trap_enable_args - Arguments for KFD_IOC_DBG_TRAP_ENABLE.
11641162 *
11651163 * Enables debug session for target process. Call @op KFD_IOC_DBG_TRAP_DISABLE in
11661164 * kfd_ioctl_dbg_trap_args to disable debug session.
11671165 *
1168− * @exception_mask (IN) - exceptions to raise to the debugger
1169− * @rinfo_ptr (IN) - pointer to runtime info buffer (see kfd_runtime_info)
1170− * @rinfo_size (IN/OUT) - size of runtime info buffer in bytes
1171− * @dbg_fd (IN) - fd the KFD will nofify the debugger with of raised
1166+ * @exception_mask: (IN) - exceptions to raise to the debugger
1167+ * @rinfo_ptr: (IN) - pointer to runtime info buffer (see kfd_runtime_info)
1168+ * @rinfo_size: (IN/OUT) - size of runtime info buffer in bytes
1169+ * @dbg_fd: (IN) - fd the KFD will nofify the debugger with of raised
11721170 * exceptions set in exception_mask.
11731171 *
11741172 * Generic errors apply (see kfd_dbg_trap_operations).
@@ -1188,15 +1186,14 @@ struct kfd_ioctl_dbg_trap_enable_args { · 13 unmodified lines
11881186 };
11891187
11901188 /**
1191− * kfd_ioctl_dbg_trap_send_runtime_event_args
1192− *
1189+ * struct kfd_ioctl_dbg_trap_send_runtime_event_args - Arguments for
1190+ * KFD_IOC_DBG_TRAP_SEND_RUNTIME_EVENT.
11931191 *
1194− * Arguments for KFD_IOC_DBG_TRAP_SEND_RUNTIME_EVENT.
11951192 * Raises exceptions to runtime.
11961193 *
1197− * @exception_mask (IN) - exceptions to raise to runtime
1198− * @gpu_id (IN) - target device id
1199− * @queue_id (IN) - target queue id
1194+ * @exception_mask: (IN) - exceptions to raise to runtime
1195+ * @gpu_id: (IN) - target device id
1196+ * @queue_id: (IN) - target queue id
12001197 *
12011198 * Generic errors apply (see kfd_dbg_trap_operations).
12021199 * Return - 0 on SUCCESS.
@@ -1213,12 +1210,12 @@ struct kfd_ioctl_dbg_trap_send_runtime_event_args { · 10 unmodified lines
12131210 };
12141211
12151212 /**
1216− * kfd_ioctl_dbg_trap_set_exceptions_enabled_args
1213+ * struct kfd_ioctl_dbg_trap_set_exceptions_enabled_args - Arguments for
1214+ * KFD_IOC_SET_EXCEPTIONS_ENABLED
12171215 *
1218− * Arguments for KFD_IOC_SET_EXCEPTIONS_ENABLED
12191216 * Set new exceptions to be raised to the debugger.
12201217 *
1221− * @exception_mask (IN) - new exceptions to raise the debugger
1218+ * @exception_mask: (IN) - new exceptions to raise the debugger
12221219 *
12231220 * Generic errors apply (see kfd_dbg_trap_operations).
12241221 * Return - 0 on SUCCESS.
@@ -1228,16 +1225,16 @@ struct kfd_ioctl_dbg_trap_set_exceptions_enabled_args { · 3 unmodified lines
12281225 };
12291226
12301227 /**
1231− * kfd_ioctl_dbg_trap_set_wave_launch_override_args
1228+ * struct kfd_ioctl_dbg_trap_set_wave_launch_override_args - Arguments for
1229+ * KFD_IOC_DBG_TRAP_SET_WAVE_LAUNCH_OVERRIDE
12321230 *
1233− * Arguments for KFD_IOC_DBG_TRAP_SET_WAVE_LAUNCH_OVERRIDE
12341231 * Enable HW exceptions to raise trap.
12351232 *
1236− * @override_mode (IN) - see kfd_dbg_trap_override_mode
1237− * @enable_mask (IN/OUT) - reference kfd_dbg_trap_mask.
1233+ * @override_mode: (IN) - see kfd_dbg_trap_override_mode
1234+ * @enable_mask: (IN/OUT) - reference kfd_dbg_trap_mask.
12381235 * IN is the override modes requested to be enabled.
12391236 * OUT is referenced in Return below.
1240− * @support_request_mask (IN/OUT) - reference kfd_dbg_trap_mask.
1237+ * @support_request_mask: (IN/OUT) - reference kfd_dbg_trap_mask.
12411238 * IN is the override modes requested for support check.
12421239 * OUT is referenced in Return below.
12431240 *
@@ -1254,36 +1251,38 @@ struct kfd_ioctl_dbg_trap_set_wave_launch_override_args { · 10 unmodified lines
12541251 __u32 override_mode;
12551252 __u32 enable_mask;
12561253 __u32 support_request_mask;
1254+ /* private: */
12571255 __u32 pad;
12581256 };
12591257
12601258 /**
1261− * kfd_ioctl_dbg_trap_set_wave_launch_mode_args
1259+ * struct kfd_ioctl_dbg_trap_set_wave_launch_mode_args - Arguments for
1260+ * KFD_IOC_DBG_TRAP_SET_WAVE_LAUNCH_MODE
12621261 *
1263− * Arguments for KFD_IOC_DBG_TRAP_SET_WAVE_LAUNCH_MODE
12641262 * Set wave launch mode.
12651263 *
1266− * @mode (IN) - see kfd_dbg_trap_wave_launch_mode
1264+ * @launch_mode: (IN) - see kfd_dbg_trap_wave_launch_mode
12671265 *
12681266 * Generic errors apply (see kfd_dbg_trap_operations).
12691267 * Return - 0 on SUCCESS.
12701268 */
12711269 struct kfd_ioctl_dbg_trap_set_wave_launch_mode_args {
12721270 __u32 launch_mode;
1271+ /* private: */
12731272 __u32 pad;
12741273 };
12751274
12761275 /**
1277− * kfd_ioctl_dbg_trap_suspend_queues_ags
1276+ * struct kfd_ioctl_dbg_trap_suspend_queues_args - Arguments for
1277+ * KFD_IOC_DBG_TRAP_SUSPEND_QUEUES
12781278 *
1279− * Arguments for KFD_IOC_DBG_TRAP_SUSPEND_QUEUES
12801279 * Suspend queues.
12811280 *
1282− * @exception_mask (IN) - raised exceptions to clear
1283− * @queue_array_ptr (IN) - pointer to array of queue ids (u32 per queue id)
1281+ * @exception_mask: (IN) - raised exceptions to clear
1282+ * @queue_array_ptr: (IN) - pointer to array of queue ids (u32 per queue id)
12841283 * to suspend
1285− * @num_queues (IN) - number of queues to suspend in @queue_array_ptr
1286− * @grace_period (IN) - wave time allowance before preemption
1284+ * @num_queues: (IN) - number of queues to suspend in @queue_array_ptr
1285+ * @grace_period: (IN) - wave time allowance before preemption
12871286 * per 1K GPU clock cycle unit
12881287 *
12891288 * Generic errors apply (see kfd_dbg_trap_operations).
@@ -1311,14 +1310,14 @@ struct kfd_ioctl_dbg_trap_suspend_queues_args { · 21 unmodified lines
13111310 };
13121311
13131312 /**
1314− * kfd_ioctl_dbg_trap_resume_queues_args
1313+ * struct kfd_ioctl_dbg_trap_resume_queues_args - Arguments for
1314+ * KFD_IOC_DBG_TRAP_RESUME_QUEUES
13151315 *
1316− * Arguments for KFD_IOC_DBG_TRAP_RESUME_QUEUES
13171316 * Resume queues.
13181317 *
1319− * @queue_array_ptr (IN) - pointer to array of queue ids (u32 per queue id)
1318+ * @queue_array_ptr: (IN) - pointer to array of queue ids (u32 per queue id)
13201319 * to resume
1321− * @num_queues (IN) - number of queues to resume in @queue_array_ptr
1320+ * @num_queues: (IN) - number of queues to resume in @queue_array_ptr
13221321 *
13231322 * Generic errors apply (see kfd_dbg_trap_operations).
13241323 * Return - Number of queues resumed on SUCCESS.
@@ -1331,20 +1330,21 @@ struct kfd_ioctl_dbg_trap_suspend_queues_args { · 6 unmodified lines
13311330 struct kfd_ioctl_dbg_trap_resume_queues_args {
13321331 __u64 queue_array_ptr;
13331332 __u32 num_queues;
1333+ /* private: */
13341334 __u32 pad;
13351335 };
13361336
13371337 /**
1338− * kfd_ioctl_dbg_trap_set_node_address_watch_args
1338+ * struct kfd_ioctl_dbg_trap_set_node_address_watch_args - Arguments for
1339+ * KFD_IOC_DBG_TRAP_SET_NODE_ADDRESS_WATCH
13391340 *
1340− * Arguments for KFD_IOC_DBG_TRAP_SET_NODE_ADDRESS_WATCH
13411341 * Sets address watch for device.
13421342 *
1343− * @address (IN) - watch address to set
1344− * @mode (IN) - see kfd_dbg_trap_address_watch_mode
1345− * @mask (IN) - watch address mask
1346− * @gpu_id (IN) - target gpu to set watch point
1347− * @id (OUT) - watch id allocated
1343+ * @address: (IN) - watch address to set
1344+ * @mode: (IN) - see kfd_dbg_trap_address_watch_mode
1345+ * @mask: (IN) - watch address mask
1346+ * @gpu_id: (IN) - target gpu to set watch point
1347+ * @id: (OUT) - watch id allocated
13481348 *
13491349 * Generic errors apply (see kfd_dbg_trap_operations).
13501350 * Return - 0 on SUCCESS.
@@ -1361,13 +1361,13 @@ struct kfd_ioctl_dbg_trap_set_node_address_watch_args { · 10 unmodified lines
13611361 };
13621362
13631363 /**
1364− * kfd_ioctl_dbg_trap_clear_node_address_watch_args
1364+ * struct kfd_ioctl_dbg_trap_clear_node_address_watch_args - Arguments for
1365+ * KFD_IOC_DBG_TRAP_CLEAR_NODE_ADDRESS_WATCH
13651366 *
1366− * Arguments for KFD_IOC_DBG_TRAP_CLEAR_NODE_ADDRESS_WATCH
13671367 * Clear address watch for device.
13681368 *
1369− * @gpu_id (IN) - target device to clear watch point
1370− * @id (IN) - allocated watch id to clear
1369+ * @gpu_id: (IN) - target device to clear watch point
1370+ * @id: (IN) - allocated watch id to clear
13711371 *
13721372 * Generic errors apply (see kfd_dbg_trap_operations).
13731373 * Return - 0 on SUCCESS.
@@ -1380,12 +1380,12 @@ struct kfd_ioctl_dbg_trap_clear_node_address_watch_args { · 6 unmodified lines
13801380 };
13811381
13821382 /**
1383− * kfd_ioctl_dbg_trap_set_flags_args
1383+ * struct kfd_ioctl_dbg_trap_set_flags_args - Arguments for
1384+ * KFD_IOC_DBG_TRAP_SET_FLAGS
13841385 *
1385− * Arguments for KFD_IOC_DBG_TRAP_SET_FLAGS
13861386 * Sets flags for wave behaviour.
13871387 *
1388− * @flags (IN/OUT) - IN = flags to enable, OUT = flags previously enabled
1388+ * @flags: (IN/OUT) - IN = flags to enable, OUT = flags previously enabled
13891389 *
13901390 * Generic errors apply (see kfd_dbg_trap_operations).
13911391 * Return - 0 on SUCCESS.
@@ -1393,13 +1393,13 @@ struct kfd_ioctl_dbg_trap_clear_node_address_watch_args { · 1 unmodified line
13931393 */
13941394 struct kfd_ioctl_dbg_trap_set_flags_args {
13951395 __u32 flags;
1396+ /* private: */
13961397 __u32 pad;
13971398 };
13981399
13991400 /**
1400− * kfd_ioctl_dbg_trap_query_debug_event_args
1401− *
1402− * Arguments for KFD_IOC_DBG_TRAP_QUERY_DEBUG_EVENT
1401+ * struct kfd_ioctl_dbg_trap_query_debug_event_args - Arguments for
1402+ * KFD_IOC_DBG_TRAP_QUERY_DEBUG_EVENT
14031403 *
14041404 * Find one or more raised exceptions. This function can return multiple
14051405 * exceptions from a single queue or a single device with one call. To find
@@ -1409,9 +1409,9 @@ struct kfd_ioctl_dbg_trap_set_flags_args { · 3 unmodified lines
14091409 * However, clearing an exception prevents retrieving further information
14101410 * about it with KFD_IOC_DBG_TRAP_QUERY_EXCEPTION_INFO.
14111411 *
1412− * @exception_mask (IN/OUT) - exception to clear (IN) and raised (OUT)
1413− * @gpu_id (OUT) - gpu id of exceptions raised
1414− * @queue_id (OUT) - queue id of exceptions raised
1412+ * @exception_mask: (IN/OUT) - exception to clear (IN) and raised (OUT)
1413+ * @gpu_id: (OUT) - gpu id of exceptions raised
1414+ * @queue_id: (OUT) - queue id of exceptions raised
14151415 *
14161416 * Generic errors apply (see kfd_dbg_trap_operations).
14171417 * Return - 0 on raised exception found
@@ -1426,16 +1426,16 @@ struct kfd_ioctl_dbg_trap_query_debug_event_args { · 8 unmodified lines
14261426 };
14271427
14281428 /**
1429− * kfd_ioctl_dbg_trap_query_exception_info_args
1429+ * struct kfd_ioctl_dbg_trap_query_exception_info_args - Arguments for
1430+ * KFD_IOC_DBG_TRAP_QUERY_EXCEPTION_INFO
14301431 *
1431− * Arguments KFD_IOC_DBG_TRAP_QUERY_EXCEPTION_INFO
14321432 * Get additional info on raised exception.
14331433 *
1434− * @info_ptr (IN) - pointer to exception info buffer to copy to
1435− * @info_size (IN/OUT) - exception info buffer size (bytes)
1436− * @source_id (IN) - target gpu or queue id
1437− * @exception_code (IN) - target exception
1438− * @clear_exception (IN) - clear raised @exception_code exception
1434+ * @info_ptr: (IN) - pointer to exception info buffer to copy to
1435+ * @info_size: (IN/OUT) - exception info buffer size (bytes)
1436+ * @source_id: (IN) - target gpu or queue id
1437+ * @exception_code: (IN) - target exception
1438+ * @clear_exception: (IN) - clear raised @exception_code exception
14391439 * (0 = false, 1 = true)
14401440 *
14411441 * Generic errors apply (see kfd_dbg_trap_operations).
@@ -1455,20 +1455,20 @@ struct kfd_ioctl_dbg_trap_query_exception_info_args { · 13 unmodified lines
14551455 };
14561456
14571457 /**
1458− * kfd_ioctl_dbg_trap_get_queue_snapshot_args
1458+ * struct kfd_ioctl_dbg_trap_queue_snapshot_args - Arguments for
1459+ * KFD_IOC_DBG_TRAP_GET_QUEUE_SNAPSHOT
14591460 *
1460− * Arguments KFD_IOC_DBG_TRAP_GET_QUEUE_SNAPSHOT
14611461 * Get queue information.
14621462 *
1463− * @exception_mask (IN) - exceptions raised to clear
1464− * @snapshot_buf_ptr (IN) - queue snapshot entry buffer (see kfd_queue_snapshot_entry)
1465− * @num_queues (IN/OUT) - number of queue snapshot entries
1463+ * @exception_mask: (IN) - exceptions raised to clear
1464+ * @snapshot_buf_ptr: (IN) - queue snapshot entry buffer (see kfd_queue_snapshot_entry)
1465+ * @num_queues: (IN/OUT) - number of queue snapshot entries
14661466 * The debugger specifies the size of the array allocated in @num_queues.
14671467 * KFD returns the number of queues that actually existed. If this is
14681468 * larger than the size specified by the debugger, KFD will not overflow
14691469 * the array allocated by the debugger.
14701470 *
1471− * @entry_size (IN/OUT) - size per entry in bytes
1471+ * @entry_size: (IN/OUT) - size per entry in bytes
14721472 * The debugger specifies sizeof(struct kfd_queue_snapshot_entry) in
14731473 * @entry_size. KFD returns the number of bytes actually populated per
14741474 * entry. The debugger should use the KFD_IOCTL_MINOR_VERSION to determine,
@@ -1491,20 +1491,20 @@ struct kfd_ioctl_dbg_trap_queue_snapshot_args { · 16 unmodified lines
14911491 };
14921492
14931493 /**
1494− * kfd_ioctl_dbg_trap_get_device_snapshot_args
1494+ * struct kfd_ioctl_dbg_trap_device_snapshot_args - Arguments for
1495+ * KFD_IOC_DBG_TRAP_GET_DEVICE_SNAPSHOT
14951496 *
1496− * Arguments for KFD_IOC_DBG_TRAP_GET_DEVICE_SNAPSHOT
14971497 * Get device information.
14981498 *
1499− * @exception_mask (IN) - exceptions raised to clear
1500− * @snapshot_buf_ptr (IN) - pointer to snapshot buffer (see kfd_dbg_device_info_entry)
1501− * @num_devices (IN/OUT) - number of debug devices to snapshot
1499+ * @exception_mask: (IN) - exceptions raised to clear
1500+ * @snapshot_buf_ptr: (IN) - pointer to snapshot buffer (see kfd_dbg_device_info_entry)
1501+ * @num_devices: (IN/OUT) - number of debug devices to snapshot
15021502 * The debugger specifies the size of the array allocated in @num_devices.
15031503 * KFD returns the number of devices that actually existed. If this is
15041504 * larger than the size specified by the debugger, KFD will not overflow
15051505 * the array allocated by the debugger.
15061506 *
1507− * @entry_size (IN/OUT) - size per entry in bytes
1507+ * @entry_size: (IN/OUT) - size per entry in bytes
15081508 * The debugger specifies sizeof(struct kfd_dbg_device_info_entry) in
15091509 * @entry_size. KFD returns the number of bytes actually populated. The
15101510 * debugger should use KFD_IOCTL_MINOR_VERSION to determine, which fields
@@ -1527,12 +1527,10 @@ struct kfd_ioctl_dbg_trap_device_snapshot_args { · 16 unmodified lines
15271527 };
15281528
15291529 /**
1530− * kfd_ioctl_dbg_trap_args
1531− *
1532− * Arguments to debug target process.
1530+ * struct kfd_ioctl_dbg_trap_args - Arguments to debug target process.
15331531 *
1534− * @pid - target process to debug
1535− * @op - debug operation (see kfd_dbg_trap_operations)
1532+ * @pid: target process to debug
1533+ * @op: debug operation (see kfd_dbg_trap_operations)
15361534 *
15371535 * @op determines which union struct args to use.
15381536 * Refer to kern docs for each kfd_ioctl_dbg_trap_*_args struct.
@@ -1567,7 +1565,7 @@ enum kfd_profiler_ops { · 28 unmodified lines
15671565 };
15681566
15691567 /**
1570− * Enables/Disables GPU Specific profiler settings
1568+ * struct kfd_ioctl_pmc_settings - Enables/Disables GPU Specific profiler settings
15711569 */
15721570 struct kfd_ioctl_pmc_settings {
15731571 __u32 gpu_id; /* This is the user_gpu_id */

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