Commit 6840fb43 authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Wen Zhiwei
Browse files

drm/amd: Add gfx12 swizzle mode defs 

stable inclusion
from stable-v6.6.51
commit 5f2a2bf25395f50b1b2cb7c04ae2d5986520be5f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5f2a2bf25395f50b1b2cb7c04ae2d5986520be5f



--------------------------------

[ Upstream commit 7ceb94e87bffff7c12b61eb29749e1d8ac976896 ]

Add GFX12 swizzle mode definitions for use with DCN401

Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Acked-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 38097849

include/uapi/drm/drm_fourcc.h

+16 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,7 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
#define AMD_FMT_MOD_TILE_VER_GFX10 2

#define AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS 3

#define AMD_FMT_MOD_TILE_VER_GFX11 4

#define AMD_FMT_MOD_TILE_VER_GFX12 5



/*

 * 64K_S is the same for GFX9/GFX10/GFX10_RBPLUS and hence has GFX9 as canonical
@@ -1484,6 +1485,8 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
/*

 * 64K_D for non-32 bpp is the same for GFX9/GFX10/GFX10_RBPLUS and hence has

 * GFX9 as canonical version.

 *

 * 64K_D_2D on GFX12 is identical to 64K_D on GFX11.

 */

#define AMD_FMT_MOD_TILE_GFX9_64K_D 10

#define AMD_FMT_MOD_TILE_GFX9_64K_S_X 25
@@ -1491,6 +1494,19 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
#define AMD_FMT_MOD_TILE_GFX9_64K_R_X 27

#define AMD_FMT_MOD_TILE_GFX11_256K_R_X 31



/* Gfx12 swizzle modes:

 *    0 - LINEAR

 *    1 - 256B_2D  - 2D block dimensions

 *    2 - 4KB_2D

 *    3 - 64KB_2D

 *    4 - 256KB_2D

 *    5 - 4KB_3D   - 3D block dimensions

 *    6 - 64KB_3D

 *    7 - 256KB_3D

 */

#define AMD_FMT_MOD_TILE_GFX12_64K_2D 3

#define AMD_FMT_MOD_TILE_GFX12_256K_2D 4



#define AMD_FMT_MOD_DCC_BLOCK_64B 0

#define AMD_FMT_MOD_DCC_BLOCK_128B 1

#define AMD_FMT_MOD_DCC_BLOCK_256B 2