Commit 724daa4f authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: drop persistent_swap_storage from ttm_bo_init and co



Never used as parameter, the only driver actually using this is nouveau
and there it is initialized after the BO is initialized.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 231cdafc
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -418,8 +418,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
	amdgpu_ttm_placement_from_domain(bo, domain);

	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
				 &bo->placement, page_align, &ctx, NULL,
				 acc_size, sg, resv, &amdgpu_ttm_bo_destroy);
				 &bo->placement, page_align, &ctx, acc_size,
				 sg, resv, &amdgpu_ttm_bo_destroy);
	if (unlikely(r != 0))
		return r;

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int ast_bo_create(struct drm_device *dev, int size, int align,

	ret = ttm_bo_init(&ast->ttm.bdev, &astbo->bo, size,
			  ttm_bo_type_device, &astbo->placement,
			  align >> PAGE_SHIFT, false, NULL, acc_size,
			  align >> PAGE_SHIFT, false, acc_size,
			  NULL, NULL, ast_bo_ttm_destroy);
	if (ret)
		goto error;
+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align,

	ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size,
			  ttm_bo_type_device, &bochsbo->placement,
			  align >> PAGE_SHIFT, false, NULL, acc_size,
			  align >> PAGE_SHIFT, false, acc_size,
			  NULL, NULL, bochs_bo_ttm_destroy);
	if (ret)
		return ret;
+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align,

	ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size,
			  ttm_bo_type_device, &cirrusbo->placement,
			  align >> PAGE_SHIFT, false, NULL, acc_size,
			  align >> PAGE_SHIFT, false, acc_size,
			  NULL, NULL, cirrus_bo_ttm_destroy);
	if (ret)
		return ret;
+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int hibmc_bo_create(struct drm_device *dev, int size, int align,

	ret = ttm_bo_init(&hibmc->bdev, &hibmcbo->bo, size,
			  ttm_bo_type_device, &hibmcbo->placement,
			  align >> PAGE_SHIFT, false, NULL, acc_size,
			  align >> PAGE_SHIFT, false, acc_size,
			  NULL, NULL, hibmc_bo_ttm_destroy);
	if (ret) {
		hibmc_bo_unref(&hibmcbo);
Loading