diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5711-drm-amdkfd-kfd-expose-the-hive_id-of-the-device-thro.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5711-drm-amdkfd-kfd-expose-the-hive_id-of-the-device-thro.patch | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5711-drm-amdkfd-kfd-expose-the-hive_id-of-the-device-thro.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5711-drm-amdkfd-kfd-expose-the-hive_id-of-the-device-thro.patch new file mode 100644 index 00000000..fb805e8b --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5711-drm-amdkfd-kfd-expose-the-hive_id-of-the-device-thro.patch @@ -0,0 +1,102 @@ +From 1a90a0a6690ca68f0f0f879e5316d7b7719a1e74 Mon Sep 17 00:00:00 2001 +From: Shaoyun Liu <Shaoyun.Liu@amd.com> +Date: Fri, 6 Jul 2018 11:32:42 -0400 +Subject: [PATCH 5711/5725] drm/amdkfd: kfd expose the hive_id of the device + through its node properties +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thunk will generate the XGMI topology information when necessary with the hive_id +for each specified device + +Change-Id: I3bbc37bd2af4295e24357ce82f2c760162aff9ca +Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 +++ + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +++ + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++++ + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 ++ + 5 files changed, 13 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index dd85838..04a8b5b 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -568,6 +568,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, + goto kfd_doorbell_error; + } + ++ if (kfd->kfd2kgd->get_hive_id) ++ kfd->hive_id = kfd->kfd2kgd->get_hive_id(kfd->kgd); ++ + if (kfd_topology_add_device(kfd)) { + dev_err(kfd_device, "Error adding device to topology\n"); + goto kfd_topology_add_device_error; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +index 427ceae..ca42b58 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +@@ -290,6 +290,9 @@ struct kfd_dev { + const void *cwsr_isa; + unsigned int cwsr_isa_size; + ++ /* xGMI */ ++ uint64_t hive_id; ++ + bool pci_atomic_requested; + + /* VRAM limit */ +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +index 3be2346..eb859b9 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +@@ -487,6 +487,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, + dev->node_props.location_id); + sysfs_show_32bit_prop(buffer, "drm_render_minor", + dev->node_props.drm_render_minor); ++ sysfs_show_64bit_prop(buffer, "hive_id", ++ dev->node_props.hive_id); + + if (dev->gpu) { + log_max_watch_addr = +@@ -1322,6 +1324,8 @@ int kfd_topology_add_device(struct kfd_dev *gpu) + dev->node_props.drm_render_minor = + gpu->shared_resources.drm_render_minor; + ++ dev->node_props.hive_id = gpu->hive_id; ++ + kfd_fill_mem_clk_max_info(dev); + kfd_fill_iolink_non_crat_info(dev); + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h +index c90c287..fe7b1b6 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h +@@ -53,6 +53,7 @@ + #define HSA_CAP_TRAP_DEBUG_WAVE_LAUNCH_MODE_SUPPORTED 0x20000000 + + struct kfd_node_properties { ++ uint64_t hive_id; + uint32_t cpu_cores_count; + uint32_t simd_count; + uint32_t mem_banks_count; +diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +index 865fcfd..e7ba62c 100755 +--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h ++++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +@@ -450,6 +450,8 @@ struct kfd2kgd_calls { + + void (*set_compute_idle)(struct kgd_dev *kgd, bool idle); + ++ uint64_t (*get_hive_id)(struct kgd_dev *kgd); ++ + uint32_t (*enable_debug_trap)(struct kgd_dev *kgd, + uint32_t trap_debug_wave_launch_mode, + uint32_t vmid); +-- +2.7.4 + |