From: Maxime Ripard <mripard@kernel.org>
Date: Tue, 3 Jun 2025 13:07:39 +0000 (+0200)
Subject: Merge drm-next-2025-05-28 into drm-misc-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b1166dee847d5018c1f3cc781218e806078f752;p=thirdparty%2Flinux.git

Merge drm-next-2025-05-28 into drm-misc-next

Christian needs a recent drm-next branch to merge fence patches.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
---

7b1166dee847d5018c1f3cc781218e806078f752
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 5a231b997d651,9ea0d9b71f48d..a2adaacf6adb2
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -293,11 -293,28 +293,29 @@@ static int amdgpu_cs_pass1(struct amdgp
  
  	for (i = 0; i < p->gang_size; ++i) {
  		ret = amdgpu_job_alloc(p->adev, vm, p->entities[i], vm,
 -				       num_ibs[i], &p->jobs[i]);
 +				       num_ibs[i], &p->jobs[i],
 +				       p->filp->client_id);
  		if (ret)
  			goto free_all_kdata;
- 		p->jobs[i]->enforce_isolation = p->adev->enforce_isolation[fpriv->xcp_id];
+ 		switch (p->adev->enforce_isolation[fpriv->xcp_id]) {
+ 		case AMDGPU_ENFORCE_ISOLATION_DISABLE:
+ 		default:
+ 			p->jobs[i]->enforce_isolation = false;
+ 			p->jobs[i]->run_cleaner_shader = false;
+ 			break;
+ 		case AMDGPU_ENFORCE_ISOLATION_ENABLE:
+ 			p->jobs[i]->enforce_isolation = true;
+ 			p->jobs[i]->run_cleaner_shader = true;
+ 			break;
+ 		case AMDGPU_ENFORCE_ISOLATION_ENABLE_LEGACY:
+ 			p->jobs[i]->enforce_isolation = true;
+ 			p->jobs[i]->run_cleaner_shader = false;
+ 			break;
+ 		case AMDGPU_ENFORCE_ISOLATION_NO_CLEANER_SHADER:
+ 			p->jobs[i]->enforce_isolation = true;
+ 			p->jobs[i]->run_cleaner_shader = false;
+ 			break;
+ 		}
  	}
  	p->gang_leader = p->jobs[p->gang_leader_idx];