From 438fbec76af542ceb506ce881c71bd66e2bbca7c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Tue, 20 Mar 2018 15:36:54 -0400 Subject: [PATCH] Revert "Revert "Revert "drm/amdkfd: Change vega10_noretry default to 1""" This reverts commit 57e56accfbbdfb897cecb5b0a0844f70b90d90a5. Change-Id: I3e184e532d65d69deec31d7aa3877124f6537b3c Signed-off-by: Yong Zhao --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 4 ++-- 2 files changed, 3 insertions(+), 4 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 4a9f4e7fbf21c..dde5882d98fe9 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 @@ -62,8 +62,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 && - !dqm->dev->device_info->is_need_iommu_device) + if (vega10_noretry) 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 0396398141f6b..368c16f68ab3d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c @@ -84,10 +84,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; +int vega10_noretry; module_param_named(noretry, vega10_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 Vega10 (0 = retry enabled (default), 1 = retry disabled)"); int priv_cp_queues; module_param(priv_cp_queues, int, 0644);