History

Merge tag 'amd-drm-next-6.11-2024-07-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.11-2024-07-03: amdgpu: - Use vmalloc for dc_state - Replay fixes - Freesync fixes - DCN 4.0.1 fixes - DML fixes - DCC updates - Misc code cleanups and bug fixes - 8K display fixes - DCN 3.5 fixes - Restructure DIO code - DML1 fixes - DML2 fixes - GFX11 fix - GFX12 updates - GFX12 modifiers fixes - RAS fixes - IP dump fixes - Add some updated IP version checks _ Silence UBSAN warning radeon: - GPUVM fix

Daniel Vetter committed 2 years ago

Commit 6be146c2 parents 71e9f40 4ed6a3694 files · +624 −318Browse files

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

Unified · Split

include/uapi/drm/drm_fourcc.h+2−3
@@ -1506,6 +1506,8 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 1505 unmodified lines
1506 * 6 - 64KB_3D1506 * 6 - 64KB_3D
1507 * 7 - 256KB_3D1507 * 7 - 256KB_3D
1508 */1508 */
1509#define AMD_FMT_MOD_TILE_GFX12_256B_2D 1
1510#define AMD_FMT_MOD_TILE_GFX12_4K_2D 2
1509#define AMD_FMT_MOD_TILE_GFX12_64K_2D 31511#define AMD_FMT_MOD_TILE_GFX12_64K_2D 3
1510#define AMD_FMT_MOD_TILE_GFX12_256K_2D 41512#define AMD_FMT_MOD_TILE_GFX12_256K_2D 4
1511 1513
@@ -1540,9 +1542,6 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 28 unmodified lines
1540#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_SHIFT 181542#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_SHIFT 18
1541#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_MASK 0x31543#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3
1542 1544
1543#define AMD_FMT_MOD_GFX12_DCC_MAX_COMPRESSED_BLOCK_SHIFT 3
1544#define AMD_FMT_MOD_GFX12_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 /* 0:64B, 1:128B, 2:256B */
1545
1546/*1545/*
1547 * DCC supports embedding some clear colors directly in the DCC surface.1546 * DCC supports embedding some clear colors directly in the DCC surface.
1548 * However, on older GPUs the rendering HW ignores the embedded clear color1547 * However, on older GPUs the rendering HW ignores the embedded clear color