Commit 08bb88cf authored by Dave Airlie's avatar Dave Airlie

drm/ttm: make ttm_tt unbind function return void.

The return value just led to BUG_ON, I think if a driver wants
to BUG_ON here it can do it itself. (don't BUG_ON).
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200728040003.20398-1-airlied@gmail.com
parent 92be4239
...@@ -1292,7 +1292,7 @@ int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo) ...@@ -1292,7 +1292,7 @@ int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo)
* Called by ttm_tt_unbind() on behalf of ttm_bo_move_ttm() and * Called by ttm_tt_unbind() on behalf of ttm_bo_move_ttm() and
* ttm_tt_destroy(). * ttm_tt_destroy().
*/ */
static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm) static void amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev); struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev);
struct amdgpu_ttm_tt *gtt = (void *)ttm; struct amdgpu_ttm_tt *gtt = (void *)ttm;
...@@ -1303,14 +1303,13 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm) ...@@ -1303,14 +1303,13 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
amdgpu_ttm_tt_unpin_userptr(ttm); amdgpu_ttm_tt_unpin_userptr(ttm);
if (gtt->offset == AMDGPU_BO_INVALID_OFFSET) if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
return 0; return;
/* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */ /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
r = amdgpu_gart_unbind(adev, gtt->offset, ttm->num_pages); r = amdgpu_gart_unbind(adev, gtt->offset, ttm->num_pages);
if (r) if (r)
DRM_ERROR("failed to unbind %lu pages at 0x%08llX\n", DRM_ERROR("failed to unbind %lu pages at 0x%08llX\n",
gtt->ttm.ttm.num_pages, gtt->offset); gtt->ttm.ttm.num_pages, gtt->offset);
return r;
} }
static void amdgpu_ttm_backend_destroy(struct ttm_tt *ttm) static void amdgpu_ttm_backend_destroy(struct ttm_tt *ttm)
......
...@@ -46,12 +46,11 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *reg) ...@@ -46,12 +46,11 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *reg)
return 0; return 0;
} }
static int static void
nv04_sgdma_unbind(struct ttm_tt *ttm) nv04_sgdma_unbind(struct ttm_tt *ttm)
{ {
struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm; struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;
nouveau_mem_fini(nvbe->mem); nouveau_mem_fini(nvbe->mem);
return 0;
} }
static struct ttm_backend_func nv04_sgdma_backend = { static struct ttm_backend_func nv04_sgdma_backend = {
......
...@@ -149,10 +149,9 @@ static int qxl_ttm_backend_bind(struct ttm_tt *ttm, ...@@ -149,10 +149,9 @@ static int qxl_ttm_backend_bind(struct ttm_tt *ttm,
return -1; return -1;
} }
static int qxl_ttm_backend_unbind(struct ttm_tt *ttm) static void qxl_ttm_backend_unbind(struct ttm_tt *ttm)
{ {
/* Not implemented */ /* Not implemented */
return -1;
} }
static void qxl_ttm_backend_destroy(struct ttm_tt *ttm) static void qxl_ttm_backend_destroy(struct ttm_tt *ttm)
......
...@@ -591,7 +591,7 @@ static int radeon_ttm_backend_bind(struct ttm_tt *ttm, ...@@ -591,7 +591,7 @@ static int radeon_ttm_backend_bind(struct ttm_tt *ttm,
return 0; return 0;
} }
static int radeon_ttm_backend_unbind(struct ttm_tt *ttm) static void radeon_ttm_backend_unbind(struct ttm_tt *ttm)
{ {
struct radeon_ttm_tt *gtt = (void *)ttm; struct radeon_ttm_tt *gtt = (void *)ttm;
...@@ -599,8 +599,6 @@ static int radeon_ttm_backend_unbind(struct ttm_tt *ttm) ...@@ -599,8 +599,6 @@ static int radeon_ttm_backend_unbind(struct ttm_tt *ttm)
if (gtt->userptr) if (gtt->userptr)
radeon_ttm_tt_unpin_userptr(ttm); radeon_ttm_tt_unpin_userptr(ttm);
return 0;
} }
static void radeon_ttm_backend_destroy(struct ttm_tt *ttm) static void radeon_ttm_backend_destroy(struct ttm_tt *ttm)
......
...@@ -82,17 +82,18 @@ static int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) ...@@ -82,17 +82,18 @@ static int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)
return ret; return ret;
} }
static int ttm_agp_unbind(struct ttm_tt *ttm) static void ttm_agp_unbind(struct ttm_tt *ttm)
{ {
struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm); struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
if (agp_be->mem) { if (agp_be->mem) {
if (agp_be->mem->is_bound) if (agp_be->mem->is_bound) {
return agp_unbind_memory(agp_be->mem); agp_unbind_memory(agp_be->mem);
return;
}
agp_free_memory(agp_be->mem); agp_free_memory(agp_be->mem);
agp_be->mem = NULL; agp_be->mem = NULL;
} }
return 0;
} }
static void ttm_agp_destroy(struct ttm_tt *ttm) static void ttm_agp_destroy(struct ttm_tt *ttm)
......
...@@ -313,11 +313,8 @@ EXPORT_SYMBOL(ttm_dma_tt_fini); ...@@ -313,11 +313,8 @@ EXPORT_SYMBOL(ttm_dma_tt_fini);
void ttm_tt_unbind(struct ttm_tt *ttm) void ttm_tt_unbind(struct ttm_tt *ttm)
{ {
int ret;
if (ttm->state == tt_bound) { if (ttm->state == tt_bound) {
ret = ttm->func->unbind(ttm); ttm->func->unbind(ttm);
BUG_ON(ret);
ttm->state = tt_unbound; ttm->state = tt_unbound;
} }
} }
......
...@@ -610,7 +610,7 @@ static int vmw_ttm_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) ...@@ -610,7 +610,7 @@ static int vmw_ttm_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)
return 0; return 0;
} }
static int vmw_ttm_unbind(struct ttm_tt *ttm) static void vmw_ttm_unbind(struct ttm_tt *ttm)
{ {
struct vmw_ttm_tt *vmw_be = struct vmw_ttm_tt *vmw_be =
container_of(ttm, struct vmw_ttm_tt, dma_ttm.ttm); container_of(ttm, struct vmw_ttm_tt, dma_ttm.ttm);
...@@ -628,8 +628,6 @@ static int vmw_ttm_unbind(struct ttm_tt *ttm) ...@@ -628,8 +628,6 @@ static int vmw_ttm_unbind(struct ttm_tt *ttm)
if (vmw_be->dev_priv->map_mode == vmw_dma_map_bind) if (vmw_be->dev_priv->map_mode == vmw_dma_map_bind)
vmw_ttm_unmap_dma(vmw_be); vmw_ttm_unmap_dma(vmw_be);
return 0;
} }
......
...@@ -70,7 +70,7 @@ struct ttm_backend_func { ...@@ -70,7 +70,7 @@ struct ttm_backend_func {
* Unbind previously bound backend pages. This function should be * Unbind previously bound backend pages. This function should be
* able to handle differences between aperture and system page sizes. * able to handle differences between aperture and system page sizes.
*/ */
int (*unbind) (struct ttm_tt *ttm); void (*unbind) (struct ttm_tt *ttm);
/** /**
* struct ttm_backend_func member destroy * struct ttm_backend_func member destroy
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment