drm/amdgpu: Enforce isolation as part of the job

This patch adds a new parameter 'enforce_isolation' to the amdgpu_job
structure. This parameter is used to determine whether shader isolation
should be enforced for a job. The enforce_isolation parameter is then
stored in the amdgpu_job structure and used when flushing the VM.

The enforce_isolation field of the amdgpu_job structure is set directly
after the job is allocated

This change allows more fine-grained control over shader isolation,
making it possible to enforce isolation on a per-job basis rather than
globally. This can be useful in scenarios where only certain jobs
require isolation.

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Suggested-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 5d5ba1e3d90f56bb0ca37314b526692df5209053..1e475eb01417ef865ba8e48a258253aa9a88644b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -296,6 +296,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
                                       num_ibs[i], &p->jobs[i]);
                if (ret)
                        goto free_all_kdata;
+               p->jobs[i]->enforce_isolation = p->adev->enforce_isolation[fpriv->xcp_id];
        }
        p->gang_leader = p->jobs[p->gang_leader_idx];
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
index a963a25ddd6209653fb3e70516d06b3798ec2042..ce6b9ba967fff0849d42a3e05dbfa07ebc499ea8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
@@ -76,6 +76,9 @@ struct amdgpu_job {
        /* job_run_counter >= 1 means a resubmit job */
        uint32_t                job_run_counter;
 
+       /* enforce isolation */
+       bool                    enforce_isolation;
+
        uint32_t                num_ibs;
        struct amdgpu_ib        ibs[];
 };

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 71ef3308be920ccaa6ebb4ef24cda51e07012a84..1468222ea0cdf44861435972a1b9a024ff52f1a7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -682,7 +682,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,
                ring->funcs->emit_wreg;
 
        if (adev->gfx.enable_cleaner_shader &&
-           ring->funcs->emit_cleaner_shader)
+           ring->funcs->emit_cleaner_shader &&
+           job->enforce_isolation)
                ring->funcs->emit_cleaner_shader(ring);
 
        if (!vm_flush_needed && !gds_switch_needed && !need_pipe_sync)