Commit a35455d0 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup amdgpu_vm_init() 



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: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 25e9146a

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+3 −13
Original line number Diff line number Diff line
@@ -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);



		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;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h

+1 −2
Original line number Diff line number Diff line
@@ -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);