mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
ecf96b52bf
Clean that up further and also fix another case where the BO wasn't kmapped for CPU based updates. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
128 lines
3.6 KiB
C
128 lines
3.6 KiB
C
/*
|
|
* Copyright 2019 Advanced Micro Devices, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "amdgpu_vm.h"
|
|
#include "amdgpu_object.h"
|
|
#include "amdgpu_trace.h"
|
|
|
|
/**
|
|
* amdgpu_vm_cpu_map_table - make sure new PDs/PTs are kmapped
|
|
*
|
|
* @table: newly allocated or validated PD/PT
|
|
*/
|
|
static int amdgpu_vm_cpu_map_table(struct amdgpu_bo *table)
|
|
{
|
|
return amdgpu_bo_kmap(table, NULL);
|
|
}
|
|
|
|
/**
|
|
* amdgpu_vm_cpu_prepare - prepare page table update with the CPU
|
|
*
|
|
* @p: see amdgpu_vm_update_params definition
|
|
* @owner: owner we need to sync to
|
|
* @exclusive: exclusive move fence we need to sync to
|
|
*
|
|
* Returns:
|
|
* Negativ errno, 0 for success.
|
|
*/
|
|
static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p, void *owner,
|
|
struct dma_fence *exclusive)
|
|
{
|
|
int r;
|
|
|
|
/* Wait for PT BOs to be idle. PTs share the same resv. object
|
|
* as the root PD BO
|
|
*/
|
|
r = amdgpu_bo_sync_wait(p->vm->root.base.bo, owner, true);
|
|
if (unlikely(r))
|
|
return r;
|
|
|
|
/* Wait for any BO move to be completed */
|
|
if (exclusive) {
|
|
r = dma_fence_wait(exclusive, true);
|
|
if (unlikely(r))
|
|
return r;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_vm_cpu_update - helper to update page tables via CPU
|
|
*
|
|
* @p: see amdgpu_vm_update_params definition
|
|
* @bo: PD/PT to update
|
|
* @pe: kmap addr of the page entry
|
|
* @addr: dst addr to write into pe
|
|
* @count: number of page entries to update
|
|
* @incr: increase next addr by incr bytes
|
|
* @flags: hw access flags
|
|
*
|
|
* Write count number of PT/PD entries directly.
|
|
*/
|
|
static int amdgpu_vm_cpu_update(struct amdgpu_vm_update_params *p,
|
|
struct amdgpu_bo *bo, uint64_t pe,
|
|
uint64_t addr, unsigned count, uint32_t incr,
|
|
uint64_t flags)
|
|
{
|
|
unsigned int i;
|
|
uint64_t value;
|
|
|
|
pe += (unsigned long)amdgpu_bo_kptr(bo);
|
|
|
|
trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags);
|
|
|
|
for (i = 0; i < count; i++) {
|
|
value = p->pages_addr ?
|
|
amdgpu_vm_map_gart(p->pages_addr, addr) :
|
|
addr;
|
|
amdgpu_gmc_set_pte_pde(p->adev, (void *)(uintptr_t)pe,
|
|
i, value, flags);
|
|
addr += incr;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_vm_cpu_commit - commit page table update to the HW
|
|
*
|
|
* @p: see amdgpu_vm_update_params definition
|
|
* @fence: unused
|
|
*
|
|
* Make sure that the hardware sees the page table updates.
|
|
*/
|
|
static int amdgpu_vm_cpu_commit(struct amdgpu_vm_update_params *p,
|
|
struct dma_fence **fence)
|
|
{
|
|
/* Flush HDP */
|
|
mb();
|
|
amdgpu_asic_flush_hdp(p->adev, NULL);
|
|
return 0;
|
|
}
|
|
|
|
const struct amdgpu_vm_update_funcs amdgpu_vm_cpu_funcs = {
|
|
.map_table = amdgpu_vm_cpu_map_table,
|
|
.prepare = amdgpu_vm_cpu_prepare,
|
|
.update = amdgpu_vm_cpu_update,
|
|
.commit = amdgpu_vm_cpu_commit
|
|
};
|