drm/amdgpu: Update SPM_VMID with the job's vmid when application reserves the vmid
Subsystems (2)
PATCH 1/1 drm/amdgpu: Update SPM_VMID with the job's vmid when application reserves the vmid
SPM access the video memory according to SPM_VMID. It should be updated with the job's vmid right before the job is scheduled. SPM_VMID is a global resource
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +14 -0
@@ -1080,8 +1080,12 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,struct dma_fence *fence =NULL ;bool pasid_mapping_needed = false;unsigned patch_offset =0 ; +bool update_spm_vmid_needed = (job->vm && (job->vm->reserved_vmid[vmhub] !=NULL ));int r; +if (update_spm_vmid_needed && adev->gfx.rlc.funcs->update_spm_vmid) + adev->gfx.rlc.funcs->update_spm_vmid (adev, job->vmid); +if (amdgpu_vmid_had_gpu_reset (adev, id)) { gds_switch_needed = true; vm_flush_needed = true;
@@ -3213,6 +3217,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)union drm_amdgpu_vm *args = data;struct amdgpu_device *adev = dev->dev_private;struct amdgpu_fpriv *fpriv = filp->driver_priv; +long timeout =msecs_to_jiffies (2000 );int r;switch (args->in.op) {
@@ -3224,6 +3229,15 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)return r;break ;case AMDGPU_VM_OP_UNRESERVE_VMID : +if (amdgpu_sriov_runtime (adev)) + timeout =8 * timeout; + +/* Wait vm idle to make sure the vmid set in SPM_VMID is +* not referenced anymore. +*/ + r =amdgpu_vm_wait_idle (&fpriv->vm, timeout); +if (r <0 ) +return r;amdgpu_vmid_free_reserved (adev, &fpriv->vm,AMDGPU_GFXHUB_0 );break ;default :
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 04.03.20 um 05:06 schrieb Jacob He:
Quoted 38 lines
SPM access the video memory according to
SPM_VMID. It should be updated with the job's vmid right before the job is scheduled.SPM_VMIDis a global resourceChange-Id Id3881908960398f87e7c95026a54ff83ff826700Signed-off-by Jacob He <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +5
-0@@ -1080,8 +1080,12 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,struct dma_fence *fence =NULL ;bool pasid_mapping_needed = false;unsigned patch_offset =0 ; +bool update_spm_vmid_needed = (job->vm && (job->vm->reserved_vmid[vmhub] !=NULL ));int r; +if (update_spm_vmid_needed && adev->gfx.rlc.funcs->update_spm_vmid) + adev->gfx.rlc.funcs->update_spm_vmid (adev, job->vmid); +if (amdgpu_vmid_had_gpu_reset (adev, id)) { gds_switch_needed = true; vm_flush_needed = true;@@ -3213,6 +3217,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)union drm_amdgpu_vm *args = data;struct amdgpu_device *adev = dev->dev_private;struct amdgpu_fpriv *fpriv = filp->driver_priv; +long timeout =msecs_to_jiffies (2000 );int r;switch (args->in.op) {@@ -3224,6 +3229,15 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)return r;break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) · line 3240
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +9
-0case AMDGPU_VM_OP_UNRESERVE_VMID : +if (amdgpu_sriov_runtime (adev)) + timeout =8 * timeout; + +/* Wait vm idle to make sure the vmid set in SPM_VMID is +* not referenced anymore. +*/ + r =amdgpu_vm_wait_idle (&fpriv->vm, timeout); +if (r <0 ) +return r;
You also need to lock/unlock the whole VM around that. Otherwise amdgpu_vm_wait_idle() could crash.
E.g. call amdgpu_bo_reserve() on vm->root.base.bo and after you are done amdgpu_bo_unreserver().
Apart from that it looks good to me,
Christian.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) · line 3243
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0amdgpu_vmid_free_reserved (adev, &fpriv->vm,AMDGPU_GFXHUB_0 );break ;default :
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx