As both SDMA and CPU implementations always return 0, they can as well just return void.
Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 ++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 8 +++----- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 11 +++-------- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index bcb5015bdede..201e3e114f07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1024,9 +1024,7 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, struct amdgpu_vm *vm) goto error; } - r = vm->update_funcs->commit(¶ms, &vm->last_update); - if (r) - goto error; + vm->update_funcs->commit(¶ms, &vm->last_update); if (flush_tlb_needed) atomic64_inc(&vm->tlb_seq); @@ -1242,9 +1240,7 @@ int amdgpu_vm_map_range(struct amdgpu_device *adev, struct amdgpu_vm *vm, start = tmp; } - r = vm->update_funcs->commit(¶ms, fence); - if (r) - goto error_free; + vm->update_funcs->commit(¶ms, fence); if (params.needs_flush) { amdgpu_vm_tlb_flush(¶ms, fence, tlb_cb); @@ -1319,9 +1315,7 @@ int amdgpu_vm_unmap_range(struct amdgpu_device *adev, struct amdgpu_vm *vm, amdgpu_vm_pt_leaves(¶ms, start, last + 1, NULL, flags); - r = vm->update_funcs->commit(¶ms, fence); - if (r) - goto error_free; + vm->update_funcs->commit(¶ms, fence); amdgpu_vm_tlb_flush(¶ms, fence, tlb_cb); amdgpu_vm_pt_free_list(adev, ¶ms); @@ -3250,7 +3244,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid, amdgpu_vm_pt_leaves(¶ms, addr, addr + 1, dst, flags); - r = vm->update_funcs->commit(¶ms, &vm->last_update); + vm->update_funcs->commit(¶ms, &vm->last_update); error_end_critical: amdgpu_vm_end_critical(¶ms); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c index d03b9bbe20c7..ec715bcaa0f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c @@ -117,8 +117,8 @@ static int amdgpu_vm_cpu_update(struct amdgpu_vm_update_params *p, * * 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) +static void amdgpu_vm_cpu_commit(struct amdgpu_vm_update_params *p, + struct dma_fence **fence) { struct amdgpu_device *adev = p->adev; @@ -128,12 +128,10 @@ static int amdgpu_vm_cpu_commit(struct amdgpu_vm_update_params *p, mb(); /* A reset flushed the HDP anyway, so that here can be skipped when a reset is ongoing */ if (!down_read_trylock(&adev->reset_domain->sem)) - return 0; + return; amdgpu_device_flush_hdp(adev, NULL); up_read(&adev->reset_domain->sem); - - return 0; } const struct amdgpu_vm_update_funcs amdgpu_vm_cpu_funcs = { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h index 8a0e5fcbd55b..e056999d8406 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h @@ -119,8 +119,8 @@ struct amdgpu_vm_update_funcs { int (*update)(struct amdgpu_vm_update_params *p, struct amdgpu_bo_vm *bo, uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags); - int (*commit)(struct amdgpu_vm_update_params *p, - struct dma_fence **fence); + void (*commit)(struct amdgpu_vm_update_params *p, + struct dma_fence **fence); }; uint64_t amdgpu_vm_pt_clear_flags(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c index dea80796f139..f9abafef6a4f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c @@ -433,7 +433,7 @@ int amdgpu_vm_pt_clear(struct amdgpu_device *adev, struct amdgpu_vm *vm, if (r) goto exit; - r = vm->update_funcs->commit(¶ms, NULL); + vm->update_funcs->commit(¶ms, NULL); exit: drm_dev_exit(idx); return r; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c index 6dc71687c398..0611ae38a9b5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@ -101,11 +101,9 @@ static int amdgpu_vm_sdma_prepare(struct amdgpu_vm_update_params *p, * @p: see amdgpu_vm_update_params definition * @fence: resulting fence * - * Returns: - * Negativ errno, 0 for success. */ -static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, - struct dma_fence **fence) +static void amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, + struct dma_fence **fence) { struct amdgpu_ib *ib = p->job->ibs; struct amdgpu_ring *ring; @@ -143,7 +141,6 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, swap(*fence, f); } dma_fence_put(f); - return 0; } /** @@ -247,9 +244,7 @@ static int amdgpu_vm_sdma_update(struct amdgpu_vm_update_params *p, ndw -= p->job->ibs->length_dw; if (ndw < 32) { - r = amdgpu_vm_sdma_commit(p, NULL); - if (r) - return r; + amdgpu_vm_sdma_commit(p, NULL); r = amdgpu_vm_sdma_alloc_job(p, count, AMDGPU_KERNEL_JOB_ID_VM_UPDATE); -- 2.47.3
