lib/intel_bufops: Rename intel_buf_bo_size() -> intel_buf_size()

To avoid confusion with intel_buf_bo_size() which for some buffers
can return size not equal to underlying gem bo size rename it to
intel_buf_size().

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>

3 files changed, 19 insertions, 19 deletions

diff --git a/tests/i915/api_intel_bb.c b/tests/i915/api_intel_bb.c
index 74cb1841..492cedef 100644
--- a/tests/i915/api_intel_bb.c
+++ b/tests/i915/api_intel_bb.c
@@ -1055,11 +1055,11 @@ static void offset_control(struct buf_ops *bops)
 	dst1 = create_buf(bops, WIDTH, HEIGHT, COLOR_00);
 	dst2 = create_buf(bops, WIDTH, HEIGHT, COLOR_77);
 
-	intel_bb_add_object(ibb, src->handle, intel_buf_bo_size(src),
+	intel_bb_add_object(ibb, src->handle, intel_buf_size(src),
 			    src->addr.offset, 0, false);
-	intel_bb_add_object(ibb, dst1->handle, intel_buf_bo_size(dst1),
+	intel_bb_add_object(ibb, dst1->handle, intel_buf_size(dst1),
 			    dst1->addr.offset, 0, true);
-	intel_bb_add_object(ibb, dst2->handle, intel_buf_bo_size(dst2),
+	intel_bb_add_object(ibb, dst2->handle, intel_buf_size(dst2),
 			    dst2->addr.offset, 0, true);
 
 	intel_bb_out(ibb, MI_BATCH_BUFFER_END);
@@ -1080,13 +1080,13 @@ static void offset_control(struct buf_ops *bops)
 	intel_bb_reset(ibb, true);
 
 	dst3 = create_buf(bops, WIDTH, HEIGHT, COLOR_33);
-	intel_bb_add_object(ibb, dst3->handle, intel_buf_bo_size(dst3),
+	intel_bb_add_object(ibb, dst3->handle, intel_buf_size(dst3),
 			    dst3->addr.offset, 0, true);
-	intel_bb_add_object(ibb, src->handle, intel_buf_bo_size(src),
+	intel_bb_add_object(ibb, src->handle, intel_buf_size(src),
 			    src->addr.offset, 0, false);
-	intel_bb_add_object(ibb, dst1->handle, intel_buf_bo_size(dst1),
+	intel_bb_add_object(ibb, dst1->handle, intel_buf_size(dst1),
 			    dst1->addr.offset, 0, true);
-	intel_bb_add_object(ibb, dst2->handle, intel_buf_bo_size(dst2),
+	intel_bb_add_object(ibb, dst2->handle, intel_buf_size(dst2),
 			    dst2->addr.offset, 0, true);
 
 	intel_bb_out(ibb, MI_BATCH_BUFFER_END);
@@ -1140,7 +1140,7 @@ static void delta_check(struct buf_ops *bops)
 
 	buf = create_buf(bops, 0x1000, 0x10, COLOR_CC);
 	buf->addr.offset = 0xfffff000;
-	intel_bb_add_object(ibb, buf->handle, intel_buf_bo_size(buf),
+	intel_bb_add_object(ibb, buf->handle, intel_buf_size(buf),
 			    buf->addr.offset, 0, false);
 
 	intel_bb_out(ibb, MI_STORE_DWORD_IMM);
@@ -1166,7 +1166,7 @@ static void delta_check(struct buf_ops *bops)
 	gem_munmap(ptr, ibb->size);
 
 	ptr = gem_mmap__device_coherent(i915, buf->handle, 0,
-					intel_buf_bo_size(buf), PROT_READ);
+					intel_buf_size(buf), PROT_READ);
 	val = ptr[0x2000 / sizeof(uint32_t)];
 	gem_munmap(ptr, ibb->size);
 
@@ -1299,7 +1299,7 @@ static uint32_t count_compressed(int gen, struct intel_buf *buf)
 	int i915 = buf_ops_get_fd(buf->bops);
 	int ccs_size = intel_buf_ccs_width(gen, buf) * intel_buf_ccs_height(gen, buf);
 	uint8_t *ptr = gem_mmap__device_coherent(i915, buf->handle, 0,
-						 intel_buf_bo_size(buf),
+						 intel_buf_size(buf),
 						 PROT_READ);
 	uint32_t compressed = 0;
 	int i;
@@ -1308,7 +1308,7 @@ static uint32_t count_compressed(int gen, struct intel_buf *buf)
 		if (ptr[buf->ccs[0].offset + i])
 			compressed++;
 
-	munmap(ptr, intel_buf_bo_size(buf));
+	munmap(ptr, intel_buf_size(buf));
 
 	return compressed;
 }
diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
index 3aac1628..d485e341 100644
--- a/tests/i915/gem_render_copy.c
+++ b/tests/i915/gem_render_copy.c
@@ -103,11 +103,11 @@ static void *linear_copy_ccs(data_t *data, struct intel_buf *buf)
 	unsigned int gen = intel_gen(data->devid);
 	int ccs_size = intel_buf_ccs_width(gen, buf) *
 		intel_buf_ccs_height(gen, buf);
-	int bo_size = intel_buf_bo_size(buf);
+	int buf_size = intel_buf_size(buf);
 
 	ccs_data = alloc_aligned(ccs_size);
-	linear = alloc_aligned(bo_size);
-	memset(linear, 0, bo_size);
+	linear = alloc_aligned(buf_size);
+	memset(linear, 0, buf_size);
 
 	intel_buf_to_linear(data->bops, buf, linear);
 	igt_memcpy_from_wc(ccs_data, linear + buf->ccs[0].offset, ccs_size);
@@ -185,7 +185,7 @@ scratch_buf_copy(data_t *data,
 
 	igt_assert_eq(intel_buf_width(dst), intel_buf_width(src));
 	igt_assert_eq(intel_buf_height(dst), intel_buf_height(src));
-	igt_assert_eq(intel_buf_bo_size(dst), intel_buf_bo_size(src));
+	igt_assert_eq(intel_buf_size(dst), intel_buf_size(src));
 	igt_assert_eq(dst->bpp, src->bpp);
 
 	w = min(w, width - sx);
@@ -194,8 +194,8 @@ scratch_buf_copy(data_t *data,
 	h = min(h, height - sy);
 	h = min(h, height - dy);
 
-	linear_dst = alloc_aligned(intel_buf_bo_size(dst));
-	linear_src = alloc_aligned(intel_buf_bo_size(src));
+	linear_dst = alloc_aligned(intel_buf_size(dst));
+	linear_src = alloc_aligned(intel_buf_size(src));
 	intel_buf_to_linear(data->bops, src, linear_src);
 	intel_buf_to_linear(data->bops, dst, linear_dst);
 
@@ -319,7 +319,7 @@ dump_intel_buf_to_file(data_t *data, struct intel_buf *buf, const char *filename
 {
 	FILE *out;
 	void *ptr;
-	uint32_t size = intel_buf_bo_size(buf);
+	uint32_t size = intel_buf_size(buf);
 
 	gem_set_domain(data->drm_fd, buf->handle,
 		       I915_GEM_DOMAIN_CPU, 0);
diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/i915/gem_set_tiling_vs_blt.c
index ff600f94..bf274be9 100644
--- a/tests/i915/gem_set_tiling_vs_blt.c
+++ b/tests/i915/gem_set_tiling_vs_blt.c
@@ -126,7 +126,7 @@ static void do_test(struct buf_ops *bops, uint32_t tiling, unsigned stride,
 	intel_buf_init_using_handle(bops, test_buf->handle, test_buf,
 				    TEST_WIDTH(stride), TEST_HEIGHT(stride), 32,
 				    0, tiling, I915_COMPRESSION_NONE);
-	igt_assert_eq_u32(intel_buf_bo_size(test_buf), TEST_SIZE);
+	igt_assert_eq_u32(intel_buf_size(test_buf), TEST_SIZE);
 	intel_buf_set_ownership(test_buf, true);
 	intel_bb_add_intel_buf(ibb, test_buf, false);