From dc46b778d84cdcdb36a648189d74cda58e5f7833 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Tue, 3 Jul 2018 19:13:16 +0300 Subject: lib/rendercopy: Simplify reloc offsets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the hardcoded dword offsets for the relocs and instead rely fully on intel_batchbuffer_subdata_offset(). Signed-off-by: Ville Syrjälä Reviewed-by: Chris Wilson --- lib/rendercopy_gen6.c | 2 +- lib/rendercopy_gen7.c | 2 +- lib/rendercopy_gen8.c | 2 +- lib/rendercopy_gen9.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c index 031d864b..3cbe3d02 100644 --- a/lib/rendercopy_gen6.c +++ b/lib/rendercopy_gen6.c @@ -95,7 +95,7 @@ gen6_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf, ss->ss1.base_addr = buf->bo->offset; ret = drm_intel_bo_emit_reloc(batch->bo, - intel_batchbuffer_subdata_offset(batch, ss) + 4, + intel_batchbuffer_subdata_offset(batch, &ss->ss1), buf->bo, 0, read_domain, write_domain); igt_assert(ret == 0); diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c index bdcf3c7b..706d6276 100644 --- a/lib/rendercopy_gen7.c +++ b/lib/rendercopy_gen7.c @@ -90,7 +90,7 @@ gen7_bind_buf(struct intel_batchbuffer *batch, ss[7] |= HSW_SURFACE_SWIZZLE(RED, GREEN, BLUE, ALPHA); ret = drm_intel_bo_emit_reloc(batch->bo, - intel_batchbuffer_subdata_offset(batch, ss) + 4, + intel_batchbuffer_subdata_offset(batch, &ss[1]), buf->bo, 0, read_domain, write_domain); igt_assert(ret == 0); diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index 7dd7cc47..90b2730b 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -175,7 +175,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch, ss->ss8.base_addr = buf->bo->offset; ret = drm_intel_bo_emit_reloc(batch->bo, - intel_batchbuffer_subdata_offset(batch, ss) + 8 * 4, + intel_batchbuffer_subdata_offset(batch, &ss->ss8), buf->bo, 0, read_domain, write_domain); igt_assert(ret == 0); diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index 331cf056..6707ef8e 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -174,7 +174,7 @@ gen8_bind_buf(struct intel_batchbuffer *batch, struct igt_buf *buf, ss->ss8.base_addr = buf->bo->offset; ret = drm_intel_bo_emit_reloc(batch->bo, - intel_batchbuffer_subdata_offset(batch, ss) + 8 * 4, + intel_batchbuffer_subdata_offset(batch, &ss->ss8), buf->bo, 0, read_domain, write_domain); assert(ret == 0); -- cgit v1.2.3