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

Commit 2b281977 authored by Yong Zhao's avatar Yong Zhao Committed by Oded Gabbay
Browse files

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: default avatarYong Zhao <yong.zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 0e9a860c

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+8 −6
Original line number Diff line number Diff line
@@ -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);
@@ -85,17 +85,19 @@ 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;

module_param_named(noretry, vega10_noretry, int, 0644);

int noretry;

module_param(noretry, int, 0644);

MODULE_PARM_DESC(noretry,

	"Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled (default), 1 = retry disabled)");



static int amdkfd_init_completed;

	"Set sh_mem_config.retry_disable on GFXv9+ dGPUs (0 = retry enabled (default), 1 = retry disabled)");



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)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ extern int ignore_crat; 
/*

 * Set sh_mem_config.retry_disable on Vega10

 */

extern int vega10_noretry;

extern int noretry;



/*

 * Halt if HWS hang is detected