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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 5a231b997d651e9946e7fbae3ea3ebd71396b898,9ea0d9b71f48db53119ccccdd5a5b309940c091e..a2adaacf6adb25a4f1a4d1c26a90b7b17f9761e3
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
--- 2/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];
  

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_dpi.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c
Simple merge