Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13e55c38 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: separate pt alloc from lru add 



Make it possible to allocate a persistent page table.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d72d43cf

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -1851,6 +1851,7 @@ void radeon_vm_manager_fini(struct radeon_device *rdev); 
void radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm);

void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm);

int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm);

void radeon_vm_add_to_lru(struct radeon_device *rdev, struct radeon_vm *vm);

struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,

				       struct radeon_vm *vm, int ring);

void radeon_vm_fence(struct radeon_device *rdev,

drivers/gpu/drm/radeon/radeon_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev, 
	}



out:

	radeon_vm_add_to_lru(rdev, vm);

	mutex_unlock(&vm->mutex);

	mutex_unlock(&rdev->vm_manager.lock);

	return r;

drivers/gpu/drm/radeon/radeon_gart.c

+16 −4
Original line number Diff line number Diff line
@@ -617,9 +617,6 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm) 
	}



	if (vm->page_directory != NULL) {

		/* update lru */

		list_del_init(&vm->list);

		list_add_tail(&vm->list, &rdev->vm_manager.lru_vm);

		return 0;

	}
@@ -653,10 +650,25 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm) 
		return -ENOMEM;

	}



	list_add_tail(&vm->list, &rdev->vm_manager.lru_vm);

	return 0;

}



/**

 * radeon_vm_add_to_lru - add VMs page table to LRU list

 *

 * @rdev: radeon_device pointer

 * @vm: vm to add to LRU

 *

 * Add the allocated page table to the LRU list (cayman+).

 *

 * Global mutex must be locked!

 */

void radeon_vm_add_to_lru(struct radeon_device *rdev, struct radeon_vm *vm)

{

	list_del_init(&vm->list);

	list_add_tail(&vm->list, &rdev->vm_manager.lru_vm);

}



/**

 * radeon_vm_grab_id - allocate the next free VMID

 *