Am 2021-04-22 um 11:39 a.m. schrieb Nirmoy Das: > Currently only way to create compute vm is through > amdgpu_vm_make_compute(). So vm_context isn't required > anymore for amdgpu_vm_init(). > > Signed-off-by: Nirmoy Das <[email protected]>
I believe you can also remove the AMDGPU_VM_CONTEXT_* #defines from amdgpu_vm.h. With that fixed, the patch is Reviewed-by: Felix Kuehling <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 +++------------- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +-- > 3 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index 39ee88d29cca..07e8a7c28561 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -1114,7 +1114,8 @@ int amdgpu_driver_open_kms(struct drm_device *dev, > struct drm_file *file_priv) > dev_warn(adev->dev, "No more PASIDs available!"); > pasid = 0; > } > - r = amdgpu_vm_init(adev, &fpriv->vm, AMDGPU_VM_CONTEXT_GFX, pasid); > + > + r = amdgpu_vm_init(adev, &fpriv->vm, pasid); > if (r) > goto error_pasid; > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index f95bcda8463f..577148a4ffaa 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -2782,8 +2782,7 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long > timeout) > * Returns: > * 0 for success, error for failure. > */ > -int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, > - int vm_context, u32 pasid) > +int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 > pasid) > { > struct amdgpu_bo_param bp; > struct amdgpu_bo *root; > @@ -2817,16 +2816,9 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct > amdgpu_vm *vm, > vm->pte_support_ats = false; > vm->is_compute_context = false; > > - if (vm_context == AMDGPU_VM_CONTEXT_COMPUTE) { > - vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode & > - AMDGPU_VM_USE_CPU_FOR_COMPUTE); > + vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode & > + AMDGPU_VM_USE_CPU_FOR_GFX); > > - if (adev->asic_type == CHIP_RAVEN) > - vm->pte_support_ats = true; > - } else { > - vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode & > - AMDGPU_VM_USE_CPU_FOR_GFX); > - } > DRM_DEBUG_DRIVER("VM update mode is %s\n", > vm->use_cpu_for_update ? "CPU" : "SDMA"); > WARN_ONCE((vm->use_cpu_for_update && > @@ -2844,8 +2836,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct > amdgpu_vm *vm, > vm->evicting = false; > > amdgpu_vm_bo_param(adev, vm, adev->vm_manager.root_level, false, &bp); > - if (vm_context == AMDGPU_VM_CONTEXT_COMPUTE) > - bp.flags &= ~AMDGPU_GEM_CREATE_SHADOW; > r = amdgpu_bo_create(adev, &bp, &root); > if (r) > goto error_free_delayed; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > index 848e175e99ff..7f07acae447b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > @@ -379,8 +379,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev); > void amdgpu_vm_manager_fini(struct amdgpu_device *adev); > > long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout); > -int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, > - int vm_context, u32 pasid); > +int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 > pasid); > int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > u32 pasid); > void amdgpu_vm_release_compute(struct amdgpu_device *adev, struct amdgpu_vm > *vm); > void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm); _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
