Commit efb5fb4a authored by Alex Deucher's avatar Alex Deucher Committed by Wen Zhiwei
Browse files

drm/amdkfd: reduce stack size in kfd_topology_add_device() 

stable inclusion
from stable-v6.6.69
commit 798f21e8a6555cfae0f40ace794529e807004927
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBNEPJ

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

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

[ Upstream commit 4ff91f218547bfc3d230c00e46725b71a625acbc ]

kfd_topology.c:2082:1: warning: the frame size of 1440 bytes is larger than 1024 bytes

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2866


Cc: Arnd Bergmann <arnd@kernel.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Stable-dep-of: 438b39ac74e2 ("drm/amdkfd: pause autosuspend when creating pdd")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent a3f4275f

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+9 −4
Original line number Diff line number Diff line
@@ -1922,7 +1922,7 @@ int kfd_topology_add_device(struct kfd_node *gpu) 
{

	uint32_t gpu_id;

	struct kfd_topology_device *dev;

	struct kfd_cu_info cu_info;

	struct kfd_cu_info *cu_info;

	int res = 0;

	int i;

	const char *asic_name = amdgpu_asic_name[gpu->adev->asic_type];
@@ -1963,8 +1963,11 @@ int kfd_topology_add_device(struct kfd_node *gpu) 
	/* Fill-in additional information that is not available in CRAT but

	 * needed for the topology

	 */

	cu_info = kzalloc(sizeof(struct kfd_cu_info), GFP_KERNEL);

	if (!cu_info)

		return -ENOMEM;



	amdgpu_amdkfd_get_cu_info(dev->gpu->adev, &cu_info);

	amdgpu_amdkfd_get_cu_info(dev->gpu->adev, cu_info);



	for (i = 0; i < KFD_TOPOLOGY_PUBLIC_NAME_SIZE-1; i++) {

		dev->node_props.name[i] = __tolower(asic_name[i]);
@@ -1974,7 +1977,7 @@ int kfd_topology_add_device(struct kfd_node *gpu) 
	dev->node_props.name[i] = '\0';



	dev->node_props.simd_arrays_per_engine =

		cu_info.num_shader_arrays_per_engine;

		cu_info->num_shader_arrays_per_engine;



	dev->node_props.gfx_target_version =

				gpu->kfd->device_info.gfx_target_version;
@@ -2055,7 +2058,7 @@ int kfd_topology_add_device(struct kfd_node *gpu) 
	 */

	if (dev->gpu->adev->asic_type == CHIP_CARRIZO) {

		dev->node_props.simd_count =

			cu_info.simd_per_cu * cu_info.cu_active_number;

			cu_info->simd_per_cu * cu_info->cu_active_number;

		dev->node_props.max_waves_per_simd = 10;

	}
@@ -2082,6 +2085,8 @@ int kfd_topology_add_device(struct kfd_node *gpu) 


	kfd_notify_gpu_change(gpu_id, 1);



	kfree(cu_info);



	return 0;

}