diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1571-drm-amdgpu-XGMI-pstate-switch-initial-support.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1571-drm-amdgpu-XGMI-pstate-switch-initial-support.patch | 191 |
1 files changed, 191 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1571-drm-amdgpu-XGMI-pstate-switch-initial-support.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1571-drm-amdgpu-XGMI-pstate-switch-initial-support.patch new file mode 100644 index 00000000..bc6304e5 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1571-drm-amdgpu-XGMI-pstate-switch-initial-support.patch @@ -0,0 +1,191 @@ +From 553c220e300d466ab3bbe998243867704c261693 Mon Sep 17 00:00:00 2001 +From: shaoyunl <shaoyun.liu@amd.com> +Date: Thu, 21 Feb 2019 16:30:25 -0500 +Subject: [PATCH 1571/2940] drm/amdgpu: XGMI pstate switch initial support + +Driver vote low to high pstate switch whenever there is an outstanding +XGMI mapping request. Driver vote high to low pstate when all the +outstanding XGMI mapping is terminated. + +Change-Id: I499fb1c389077632fe9cfce4b6dc9a33deff6875 +Signed-off-by: shaoyunl <shaoyun.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 29 +++++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 15 +++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 ++ + 6 files changed, 53 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index d907736cc74e..8e9e17ae585e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -967,6 +967,10 @@ struct amdgpu_device { + + int asic_reset_res; + struct work_struct xgmi_reset_work; ++ ++ /* counter of mapped memory through xgmi */ ++ atomic_t xgmi_map_counter; ++ + }; + + static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 48f816c3a787..f03e1ba1df94 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2056,6 +2056,9 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work) + r = amdgpu_device_enable_mgpu_fan_boost(); + if (r) + DRM_ERROR("enable mgpu fan boost failed (%d).\n", r); ++ ++ /*set to low pstate by default */ ++ amdgpu_xgmi_set_pstate(adev, 0); + } + + static void amdgpu_device_delay_enable_gfx_off(struct work_struct *work) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +index 888aced96b39..7058f0462387 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +@@ -54,6 +54,7 @@ struct amdgpu_bo_va_mapping { + uint64_t __subtree_last; + uint64_t offset; + uint64_t flags; ++ bool is_xgmi; + }; + + /* User space allocated BO in a VM */ +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index bf5b4f6ef3df..fa2764189548 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -34,6 +34,7 @@ + #include "amdgpu_trace.h" + #include "amdgpu_amdkfd.h" + #include "amdgpu_gmc.h" ++#include "amdgpu_xgmi.h" + + /** + * DOC: GPUVM +@@ -1978,8 +1979,9 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + struct ttm_mem_reg *mem; + struct drm_mm_node *nodes; + struct dma_fence *exclusive, **last_update; +- uint64_t flags; + struct amdgpu_device *bo_adev = adev; ++ bool is_xgmi = false; ++ uint64_t flags; + int r; + + if (clear || !bo) { +@@ -2001,6 +2003,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + if (bo) { + flags = amdgpu_ttm_tt_pte_flags(adev, bo->tbo.ttm, mem); + bo_adev = amdgpu_ttm_adev(bo->tbo.bdev); ++ if (adev != bo_adev && ++ adev->gmc.xgmi.hive_id && ++ adev->gmc.xgmi.hive_id == bo_adev->gmc.xgmi.hive_id) ++ is_xgmi = true; + } else { + flags = 0x0; + } +@@ -2019,6 +2025,19 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + } + + list_for_each_entry(mapping, &bo_va->invalids, list) { ++ if (mapping->is_xgmi != is_xgmi) { ++ if (is_xgmi) { ++ /* Adding an XGMI mapping to the PT */ ++ if (atomic_inc_return(&adev->xgmi_map_counter) == 1) ++ amdgpu_xgmi_set_pstate(adev, 1); ++ } else { ++ /* Removing an XGMI mapping from the PT */ ++ if (atomic_dec_return(&adev->xgmi_map_counter) == 0) ++ amdgpu_xgmi_set_pstate(adev, 0); ++ } ++ mapping->is_xgmi = is_xgmi; ++ } ++ + r = amdgpu_vm_bo_split_mapping(adev, exclusive, pages_addr, vm, + mapping, flags, bo_adev, nodes, + last_update); +@@ -2236,6 +2255,13 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, + r = amdgpu_vm_bo_update_mapping(adev, NULL, NULL, vm, + mapping->start, mapping->last, + init_pte_value, 0, &f); ++ ++ if (mapping->is_xgmi) { ++ /* Removing an XGMI mapping from the PT */ ++ if (atomic_dec_return(&adev->xgmi_map_counter) == 0) ++ amdgpu_xgmi_set_pstate(adev, 0); ++ } ++ + amdgpu_vm_free_mapping(adev, vm, mapping, f); + if (r) { + dma_fence_put(f); +@@ -2432,6 +2458,7 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, + mapping->last = eaddr; + mapping->offset = offset; + mapping->flags = flags; ++ mapping->is_xgmi = false; + + amdgpu_vm_bo_insert_map(adev, bo_va, mapping); + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +index fcc4b05c745c..807440d3edff 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +@@ -200,6 +200,7 @@ struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev, int lo + + if (lock) + mutex_lock(&tmp->hive_lock); ++ tmp->pstate = -1; + + mutex_unlock(&xgmi_mutex); + +@@ -321,3 +322,17 @@ void amdgpu_xgmi_remove_device(struct amdgpu_device *adev) + mutex_unlock(&hive->hive_lock); + } + } ++ ++int amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate) ++{ ++ int ret = 0; ++ struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, 0); ++ ++ if (!hive) ++ return 0; ++ ++ if (hive->pstate == pstate) ++ return 0; ++ /* Todo : sent the message to SMU for pstate change */ ++ return ret; ++} +\ No newline at end of file +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h +index 24a3b0362f98..7e1710fcbef2 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h +@@ -33,11 +33,13 @@ struct amdgpu_hive_info { + struct kobject *kobj; + struct device_attribute dev_attr; + struct amdgpu_device *adev; ++ int pstate; /*0 -- low , 1 -- high , -1 unknown*/ + }; + + struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev, int lock); + int amdgpu_xgmi_update_topology(struct amdgpu_hive_info *hive, struct amdgpu_device *adev); + int amdgpu_xgmi_add_device(struct amdgpu_device *adev); + void amdgpu_xgmi_remove_device(struct amdgpu_device *adev); ++int amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate); + + #endif +-- +2.17.1 + |