Merge our fixes branch to bring in the changes to the CXL documentation that the CXL removal patch depends on.
Showing the changes to include/uapi (1 of 257 files). Show all
Unified · Split
| @@ -411,13 +411,20 @@ struct drm_amdgpu_gem_userptr { · 410 unmodified lines | |||
| 411 | /* GFX12 and later: */ | 411 | /* GFX12 and later: */ |
| 412 | #define AMDGPU_TILING_GFX12_SWIZZLE_MODE_SHIFT 0 | 412 | #define AMDGPU_TILING_GFX12_SWIZZLE_MODE_SHIFT 0 |
| 413 | #define AMDGPU_TILING_GFX12_SWIZZLE_MODE_MASK 0x7 | 413 | #define AMDGPU_TILING_GFX12_SWIZZLE_MODE_MASK 0x7 |
| 414 | /* These are DCC recompression setting for memory management: */ | 414 | /* These are DCC recompression settings for memory management: */ |
| 415 | #define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_SHIFT 3 | 415 | #define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_SHIFT 3 |
| 416 | #define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 /* 0:64B, 1:128B, 2:256B */ | 416 | #define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 /* 0:64B, 1:128B, 2:256B */ |
| 417 | #define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_SHIFT 5 | 417 | #define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_SHIFT 5 |
| 418 | #define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_MASK 0x7 /* CB_COLOR0_INFO.NUMBER_TYPE */ | 418 | #define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_MASK 0x7 /* CB_COLOR0_INFO.NUMBER_TYPE */ |
| 419 | #define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_SHIFT 8 | 419 | #define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_SHIFT 8 |
| 420 | #define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_MASK 0x3f /* [0:4]:CB_COLOR0_INFO.FORMAT, [5]:MM */ | 420 | #define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_MASK 0x3f /* [0:4]:CB_COLOR0_INFO.FORMAT, [5]:MM */ |
| 421 | /* When clearing the buffer or moving it from VRAM to GTT, don't compress and set DCC metadata | ||
| 422 | * to uncompressed. Set when parts of an allocation bypass DCC and read raw data. */ | ||
| 423 | #define AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE_SHIFT 14 | ||
| 424 | #define AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE_MASK 0x1 | ||
| 425 | /* bit gap */ | ||
| 426 | #define AMDGPU_TILING_GFX12_SCANOUT_SHIFT 63 | ||
| 427 | #define AMDGPU_TILING_GFX12_SCANOUT_MASK 0x1 | ||
| 421 | 428 | ||
| 422 | /* Set/Get helpers for tiling flags. */ | 429 | /* Set/Get helpers for tiling flags. */ |
| 423 | #define AMDGPU_TILING_SET(field, value) \ | 430 | #define AMDGPU_TILING_SET(field, value) \ |