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

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

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

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

 * 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_ttm_tt *gtt = (void *)ttm;
@@ -1303,14 +1303,13 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm) 
		amdgpu_ttm_tt_unpin_userptr(ttm);



	if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)

		return 0;

		return;



	/* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */

	r = amdgpu_gart_unbind(adev, gtt->offset, ttm->num_pages);

	if (r)

		DRM_ERROR("failed to unbind %lu pages at 0x%08llX\n",

			  gtt->ttm.ttm.num_pages, gtt->offset);

	return r;

}



static void amdgpu_ttm_backend_destroy(struct ttm_tt *ttm)

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+1 −2
Original line number Diff line number Diff line
@@ -46,12 +46,11 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *reg) 
	return 0;

}



static int

static void

nv04_sgdma_unbind(struct ttm_tt *ttm)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;

	nouveau_mem_fini(nvbe->mem);

	return 0;

}



static struct ttm_backend_func nv04_sgdma_backend = {

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −2
Original line number Diff line number Diff line
@@ -149,10 +149,9 @@ static int qxl_ttm_backend_bind(struct ttm_tt *ttm, 
	return -1;

}



static int qxl_ttm_backend_unbind(struct ttm_tt *ttm)

static void qxl_ttm_backend_unbind(struct ttm_tt *ttm)

{

	/* Not implemented */

	return -1;

}



static void qxl_ttm_backend_destroy(struct ttm_tt *ttm)

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −3
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static int radeon_ttm_backend_bind(struct ttm_tt *ttm, 
	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;
@@ -599,8 +599,6 @@ static int radeon_ttm_backend_unbind(struct ttm_tt *ttm) 


	if (gtt->userptr)

		radeon_ttm_tt_unpin_userptr(ttm);



	return 0;

}



static void radeon_ttm_backend_destroy(struct ttm_tt *ttm)

drivers/gpu/drm/ttm/ttm_agp_backend.c

+5 −4
Original line number Diff line number Diff line
@@ -82,17 +82,18 @@ static int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) 
	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);



	if (agp_be->mem) {

		if (agp_be->mem->is_bound)

			return agp_unbind_memory(agp_be->mem);

		if (agp_be->mem->is_bound) {

			agp_unbind_memory(agp_be->mem);

			return;

		}

		agp_free_memory(agp_be->mem);

		agp_be->mem = NULL;

	}

	return 0;

}



static void ttm_agp_destroy(struct ttm_tt *ttm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE