Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 175b9263 authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdkfd: Simplify counting of memory banks 



Only count memory banks in one place. Ignore redundant num_banks
entry in crat_subtype_computeunit.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 42aa8793

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

+1 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ static void kfd_populated_cu_info_gpu(struct kfd_topology_device *dev, 
	dev->node_props.lds_size_in_kb = cu->lds_size_in_kb;

	dev->node_props.max_waves_per_simd = cu->max_waves_simd;

	dev->node_props.wave_front_size = cu->wave_front_size;

	dev->node_props.mem_banks_count = cu->num_banks;

	dev->node_props.array_count = cu->num_arrays;

	dev->node_props.cu_per_simd_array = cu->num_cu_per_array;

	dev->node_props.simd_per_cu = cu->num_simd_per_cu;
@@ -111,7 +110,7 @@ static int kfd_parse_subtype_mem(struct crat_subtype_memory *mem, 
							mem->length_low;

			props->width = mem->width;



			dev->mem_bank_count++;

			dev->node_props.mem_banks_count++;

			list_add_tail(&props->list, &dev->mem_props);



			break;

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

+2 −12
Original line number Diff line number Diff line
@@ -335,18 +335,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, 
			dev->node_props.cpu_cores_count);

	sysfs_show_32bit_prop(buffer, "simd_count",

			dev->node_props.simd_count);



	if (dev->mem_bank_count < dev->node_props.mem_banks_count) {

		pr_info_once("mem_banks_count truncated from %d to %d\n",

				dev->node_props.mem_banks_count,

				dev->mem_bank_count);

		sysfs_show_32bit_prop(buffer, "mem_banks_count",

				dev->mem_bank_count);

	} else {

	sysfs_show_32bit_prop(buffer, "mem_banks_count",

			dev->node_props.mem_banks_count);

	}



	sysfs_show_32bit_prop(buffer, "caches_count",

			dev->node_props.caches_count);

	sysfs_show_32bit_prop(buffer, "io_links_count",

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

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct kfd_topology_device { 
	uint32_t			gpu_id;

	uint32_t			proximity_domain;

	struct kfd_node_properties	node_props;

	uint32_t			mem_bank_count;

	struct list_head		mem_props;

	uint32_t			cache_count;

	struct list_head		cache_props;