return sh_mem_config;
}
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 3d2136adb62b..3b62b9e5ecda 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1766,6 +1766,8 @@ static int kfd_ioctl_set_xnack_mode(struct file *filep,
mutex_lock(&p->mutex);
if (args->xnack_enabled >= 0) {
+ int i;
+
if (!list_empty(&p->pqm.queues)) {
pr_debug("Process has user queues running\n");
r = -EBUSY;
@@ -1780,6 +1782,16 @@ static int kfd_ioctl_set_xnack_mode(struct file *filep,
goto out_unlock;
}
+ /* XNACK cannot be enabled for gfx12.1 */
+ for (i = 0; i < p->n_pdds; i++) {
+ struct kfd_node *dev = p->pdds[i]->dev;
+
+ if (KFD_GC_VERSION(dev) == IP_VERSION(12, 1, 0)) {
+ r = -EPERM;
+ goto out_unlock;
+ }
+ }
+
r = svm_range_switch_xnack_reserve_mem(p, args->xnack_enabled);
} else {
args->xnack_enabled = p->xnack_enabled;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c
b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c
index 525989371378..63ba13a60b98 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c
@@ -54,7 +54,6 @@ static int update_qpd_v12_1(struct device_queue_manager *dqm,
struct kfd_process_device *pdd;
struct amdgpu_device *adev = dqm->dev->adev;
struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB(0)];
- bool xnack_enabled;
pdd = qpd_to_pdd(qpd);
qpd->vm_cntx_cntl = hub->vm_cntx_cntl;
@@ -72,19 +71,10 @@ static int update_qpd_v12_1(struct device_queue_manager
*dqm,
qpd->sh_mem_ape1_base = 0;
}
- xnack_enabled = KFD_SUPPORT_XNACK_PER_PROCESS(dqm->dev) ?
- pdd->process->xnack_enabled :
- !pdd->dev->kfd->noretry;
-
- if (!xnack_enabled) {
- qpd->sh_mem_config |= 1 << SH_MEM_CONFIG__RETRY_DISABLE__SHIFT;
- qpd->vm_cntx_cntl &=
- ~(1 <<
GCVM_CONTEXT0_CNTL__RETRY_PERMISSION_OR_INVALID_PAGE_FAULT__SHIFT);
- } else {
- qpd->sh_mem_config &= ~(1 <<
SH_MEM_CONFIG__RETRY_DISABLE__SHIFT);
- qpd->vm_cntx_cntl |=
- (1 <<
GCVM_CONTEXT0_CNTL__RETRY_PERMISSION_OR_INVALID_PAGE_FAULT__SHIFT);
- }
+ /* XNACK cannot be enabled for gfx12.1 */
+ qpd->sh_mem_config |= 1 << SH_MEM_CONFIG__RETRY_DISABLE__SHIFT;
+ qpd->vm_cntx_cntl &=
+ ~(1 <<
GCVM_CONTEXT0_CNTL__RETRY_PERMISSION_OR_INVALID_PAGE_FAULT__SHIFT);
qpd->sh_mem_bases = compute_sh_mem_bases_64bit(pdd);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 546721b4d59a..059e22cd7f1a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1670,6 +1670,13 @@ bool kfd_process_xnack_mode(struct kfd_process *p, bool
supported)
KFD_GC_VERSION(dev) < IP_VERSION(12, 1, 0))
return false;
+ /* XNACK cannot be enabled on GFX12.1 . While dev->kfd->noretry
+ * should propagate this requirement, adding it explicitly here
+ * will help cover any possible future reworks
+ */
+ if (KFD_GC_VERSION(dev) == IP_VERSION(12, 1, 0))
+ return false;
+
if (dev->kfd->noretry)
return false;
}