tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

authored by

Yong Zhao and committed by
Oded Gabbay 2b281977 0e9a860c

+10 -8
+1 -1
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
··· 60 60 qpd->sh_mem_config = 61 61 SH_MEM_ALIGNMENT_MODE_UNALIGNED << 62 62 SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT; 63 - if (vega10_noretry && 63 + if (noretry && 64 64 !dqm->dev->device_info->needs_iommu_device) 65 65 qpd->sh_mem_config |= 66 66 1 << SH_MEM_CONFIG__RETRY_DISABLE__SHIFT;
+8 -6
drivers/gpu/drm/amd/amdkfd/kfd_module.c
··· 63 63 64 64 int cwsr_enable = 1; 65 65 module_param(cwsr_enable, int, 0444); 66 - MODULE_PARM_DESC(cwsr_enable, "CWSR enable (0 = Off, 1 = On (Default))"); 66 + MODULE_PARM_DESC(cwsr_enable, "CWSR enable (0 = off, 1 = on (default))"); 67 67 68 68 int max_num_of_queues_per_device = KFD_MAX_NUM_OF_QUEUES_PER_DEVICE_DEFAULT; 69 69 module_param(max_num_of_queues_per_device, int, 0444); ··· 85 85 MODULE_PARM_DESC(ignore_crat, 86 86 "Ignore CRAT table during KFD initialization (0 = use CRAT (default), 1 = ignore CRAT)"); 87 87 88 - int vega10_noretry; 89 - module_param_named(noretry, vega10_noretry, int, 0644); 88 + int noretry; 89 + module_param(noretry, int, 0644); 90 90 MODULE_PARM_DESC(noretry, 91 - "Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled (default), 1 = retry disabled)"); 92 - 93 - static int amdkfd_init_completed; 91 + "Set sh_mem_config.retry_disable on GFXv9+ dGPUs (0 = retry enabled (default), 1 = retry disabled)"); 94 92 95 93 int halt_if_hws_hang; 96 94 module_param(halt_if_hws_hang, int, 0644); 97 95 MODULE_PARM_DESC(halt_if_hws_hang, "Halt if HWS hang is detected (0 = off (default), 1 = on)"); 96 + 97 + 98 + static int amdkfd_init_completed; 99 + 98 100 99 101 int kgd2kfd_init(unsigned int interface_version, 100 102 const struct kgd2kfd_calls **g2f)
+1 -1
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
··· 142 142 /* 143 143 * Set sh_mem_config.retry_disable on Vega10 144 144 */ 145 - extern int vega10_noretry; 145 + extern int noretry; 146 146 147 147 /* 148 148 * Halt if HWS hang is detected