drm/ttm: give resource functions their own [ch] files (b2458726) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,7 @@ int amdgpu_bo_create_kernel_at(struct amdgpu_device *adev,
		if (cpu_addr)
		amdgpu_bo_kunmap(*bo_ptr);

		ttm_bo_mem_put(&(bo_ptr)->tbo, &(bo_ptr)->tbo.mem);
		ttm_resource_free(&(bo_ptr)->tbo, &(bo_ptr)->tbo.mem);

		for (i = 0; i < (*bo_ptr)->placement.num_placement; ++i) {
		(*bo_ptr)->placements[i].fpfn = offset >> PAGE_SHIFT;

+4 −4

Original line number	Diff line number	Diff line
		@@ -578,7 +578,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
		/* move BO (in tmp_mem) to new_mem */
		r = ttm_bo_move_ttm(bo, ctx, new_mem);
		out_cleanup:
		ttm_bo_mem_put(bo, &tmp_mem);
		ttm_resource_free(bo, &tmp_mem);
		return r;
		}

		@@ -625,7 +625,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
		goto out_cleanup;
		}
		out_cleanup:
		ttm_bo_mem_put(bo, &tmp_mem);
		ttm_resource_free(bo, &tmp_mem);
		return r;
		}

		@@ -1203,11 +1203,11 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)
		gtt->offset = (u64)tmp.start << PAGE_SHIFT;
		r = amdgpu_ttm_gart_bind(adev, bo, flags);
		if (unlikely(r)) {
		ttm_bo_mem_put(bo, &tmp);
		ttm_resource_free(bo, &tmp);
		return r;
		}

		ttm_bo_mem_put(bo, &bo->mem);
		ttm_resource_free(bo, &bo->mem);
		bo->mem = tmp;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,

		ret = ttm_bo_move_ttm(bo, &ctx, new_reg);
		out:
		ttm_bo_mem_put(bo, &tmp_reg);
		ttm_resource_free(bo, &tmp_reg);
		return ret;
		}

		@@ -1227,7 +1227,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
		goto out;

		out:
		ttm_bo_mem_put(bo, &tmp_reg);
		ttm_resource_free(bo, &tmp_reg);
		return ret;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
		}
		r = ttm_bo_move_ttm(bo, &ctx, new_mem);
		out_cleanup:
		ttm_bo_mem_put(bo, &tmp_mem);
		ttm_resource_free(bo, &tmp_mem);
		return r;
		}

		@@ -309,7 +309,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
		goto out_cleanup;
		}
		out_cleanup:
		ttm_bo_mem_put(bo, &tmp_mem);
		ttm_resource_free(bo, &tmp_mem);
		return r;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,8 @@

		ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \
		ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
		ttm_execbuf_util.o ttm_page_alloc.o ttm_range_manager.o
		ttm_execbuf_util.o ttm_page_alloc.o ttm_range_manager.o \
		ttm_resource.o
		ttm-$(CONFIG_AGP) += ttm_agp_backend.o
		ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o