diff options
Diffstat (limited to 'meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5651-drm-amdkfd-Use-module-parameters-noretry-as-the-inte.patch')
-rw-r--r-- | meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5651-drm-amdkfd-Use-module-parameters-noretry-as-the-inte.patch | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5651-drm-amdkfd-Use-module-parameters-noretry-as-the-inte.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5651-drm-amdkfd-Use-module-parameters-noretry-as-the-inte.patch deleted file mode 100644 index 594993b1..00000000 --- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5651-drm-amdkfd-Use-module-parameters-noretry-as-the-inte.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 140e359292b5e925b9c922968393d9c49194b143 Mon Sep 17 00:00:00 2001 -From: Yong Zhao <yong.zhao@amd.com> -Date: Fri, 20 Apr 2018 15:50:28 -0400 -Subject: [PATCH 5651/5725] drm/amdkfd: Use module parameters noretry as the - internal variable name - -This makes all module parameters use the same form. Meanwhile clean up -the surrounding code. - -Change-Id: I0f6d8db10e66256f3971cc4da4c1328a63b0101c -Signed-off-by: Yong Zhao <yong.zhao@amd.com> ---- - drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- - drivers/gpu/drm/amd/amdkfd/kfd_module.c | 14 ++++++++------ - drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- - 3 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c -index 6198bf2..cc27190 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c -@@ -60,7 +60,7 @@ static int update_qpd_v9(struct device_queue_manager *dqm, - qpd->sh_mem_config = - SH_MEM_ALIGNMENT_MODE_UNALIGNED << - SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT; -- if (vega10_noretry && -+ if (noretry && - !dqm->dev->device_info->needs_iommu_device) - qpd->sh_mem_config |= - 1 << SH_MEM_CONFIG__RETRY_DISABLE__SHIFT; -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c -index ab0bb2d..a05f734 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c -@@ -63,7 +63,7 @@ MODULE_PARM_DESC(hws_max_conc_proc, - - int cwsr_enable = 1; - module_param(cwsr_enable, int, 0444); --MODULE_PARM_DESC(cwsr_enable, "CWSR enable (0 = Off, 1 = On (Default))"); -+MODULE_PARM_DESC(cwsr_enable, "CWSR enable (0 = off, 1 = on (default))"); - - int max_num_of_queues_per_device = KFD_MAX_NUM_OF_QUEUES_PER_DEVICE_DEFAULT; - module_param(max_num_of_queues_per_device, int, 0444); -@@ -75,8 +75,6 @@ module_param(send_sigterm, int, 0444); - MODULE_PARM_DESC(send_sigterm, - "Send sigterm to HSA process on unhandled exception (0 = disable, 1 = enable)"); - --static int amdkfd_init_completed; -- - int debug_largebar; - module_param(debug_largebar, int, 0444); - MODULE_PARM_DESC(debug_largebar, -@@ -87,10 +85,10 @@ module_param(ignore_crat, int, 0444); - MODULE_PARM_DESC(ignore_crat, - "Ignore CRAT table during KFD initialization (0 = use CRAT (default), 1 = ignore CRAT)"); - --int vega10_noretry = 1; --module_param_named(noretry, vega10_noretry, int, 0644); -+int noretry = 1; -+module_param(noretry, int, 0644); - MODULE_PARM_DESC(noretry, -- "Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled, 1 = retry disabled (default))"); -+ "Set sh_mem_config.retry_disable on GFXv9+ dGPUs (0 = retry enabled, 1 = retry disabled (default))"); - - int priv_cp_queues; - module_param(priv_cp_queues, int, 0644); -@@ -101,6 +99,10 @@ int halt_if_hws_hang; - module_param(halt_if_hws_hang, int, 0644); - MODULE_PARM_DESC(halt_if_hws_hang, "Halt if HWS hang is detected (0 = off (default), 1 = on)"); - -+ -+static int amdkfd_init_completed; -+ -+ - int kgd2kfd_init(unsigned int interface_version, - const struct kgd2kfd_calls **g2f) - { -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -index efaf1e9..da27bb9 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -@@ -145,7 +145,7 @@ extern int ignore_crat; - /* - * Set sh_mem_config.retry_disable on Vega10 - */ --extern int vega10_noretry; -+extern int noretry; - - /* - * Enable privileged mode for all CP queues including user queues --- -2.7.4 - |