Skip to content

Commit

Permalink
Revert "Revert "Revert "Revert "drm/amdkfd: Change vega10_noretry def…
Browse files Browse the repository at this point in the history
…ault to 1""""

This reverts commit 438fbec.

BUG: SWDEV-146501

Change-Id: I69fceebeacf18f303264dc3488de15f42141ae9a
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
  • Loading branch information
Philip Yang authored and Philip Yang committed Mar 27, 2018
1 parent 438fbec commit f2c68ea
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
Original file line number Diff line number Diff line change
@@ -62,7 +62,8 @@ 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 (vega10_noretry &&
!dqm->dev->device_info->is_need_iommu_device)
qpd->sh_mem_config |=
1 << SH_MEM_CONFIG__RETRY_DISABLE__SHIFT;

4 changes: 2 additions & 2 deletions drivers/gpu/drm/amd/amdkfd/kfd_module.c
Original file line number Diff line number Diff line change
@@ -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;
int vega10_noretry = 1;
module_param_named(noretry, vega10_noretry, int, 0644);
MODULE_PARM_DESC(noretry,
"Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled (default), 1 = retry disabled)");
"Set sh_mem_config.retry_disable on Vega10 (0 = retry enabled, 1 = retry disabled (default))");

int priv_cp_queues;
module_param(priv_cp_queues, int, 0644);

0 comments on commit f2c68ea

Please sign in to comment.