Commit a1301e48 authored by Marek Olšák's avatar Marek Olšák Committed by Wen Zhiwei
Browse files

drm/amdgpu: handle gfx12 in amdgpu_display_verify_sizes 

stable inclusion
from stable-v6.6.51
commit 302ba299c31e0de54cea431ac1d281dbab7fd0b5
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=302ba299c31e0de54cea431ac1d281dbab7fd0b5



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

[ Upstream commit 8dd1426e2c80e32ac1995007330c8f95ffa28ebb ]

It verified GFX9-11 swizzle modes on GFX12, which has undefined behavior.

Signed-off-by: default avatarMarek Olšák <marek.olsak@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@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 6840fb43

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+26 −1
Original line number Diff line number Diff line
@@ -1033,6 +1033,30 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) 
			block_width = 256 / format_info->cpp[i];

			block_height = 1;

			block_size_log2 = 8;

		} else if (AMD_FMT_MOD_GET(TILE_VERSION, modifier) >= AMD_FMT_MOD_TILE_VER_GFX12) {

			int swizzle = AMD_FMT_MOD_GET(TILE, modifier);



			switch (swizzle) {

			case AMD_FMT_MOD_TILE_GFX12_256B_2D:

				block_size_log2 = 8;

				break;

			case AMD_FMT_MOD_TILE_GFX12_4K_2D:

				block_size_log2 = 12;

				break;

			case AMD_FMT_MOD_TILE_GFX12_64K_2D:

				block_size_log2 = 16;

				break;

			case AMD_FMT_MOD_TILE_GFX12_256K_2D:

				block_size_log2 = 18;

				break;

			default:

				drm_dbg_kms(rfb->base.dev,

					    "Gfx12 swizzle mode with unknown block size: %d\n", swizzle);

				return -EINVAL;

			}



			get_block_dimensions(block_size_log2, format_info->cpp[i],

					     &block_width, &block_height);

		} else {

			int swizzle = AMD_FMT_MOD_GET(TILE, modifier);
@@ -1068,7 +1092,8 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) 
			return ret;

	}



	if (AMD_FMT_MOD_GET(DCC, modifier)) {

	if (AMD_FMT_MOD_GET(TILE_VERSION, modifier) <= AMD_FMT_MOD_TILE_VER_GFX11 &&

	    AMD_FMT_MOD_GET(DCC, modifier)) {

		if (AMD_FMT_MOD_GET(DCC_RETILE, modifier)) {

			block_size_log2 = get_dcc_block_size(modifier, false, false);

			get_block_dimensions(block_size_log2 + 8, format_info->cpp[0],

include/uapi/drm/drm_fourcc.h

+2 −0
Original line number Diff line number Diff line
@@ -1504,6 +1504,8 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) 
 *    6 - 64KB_3D

 *    7 - 256KB_3D

 */

#define AMD_FMT_MOD_TILE_GFX12_256B_2D 1

#define AMD_FMT_MOD_TILE_GFX12_4K_2D 2

#define AMD_FMT_MOD_TILE_GFX12_64K_2D 3

#define AMD_FMT_MOD_TILE_GFX12_256K_2D 4