From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45F3A10E169 for ; Tue, 4 Apr 2023 06:57:55 +0000 (UTC) From: Vikas Srivastava To: igt-dev@lists.freedesktop.org, karolina.stolarek@intel.com Date: Tue, 4 Apr 2023 12:24:29 +0530 Message-Id: <20230404065429.3381075-5-vikas.srivastava@intel.com> In-Reply-To: <20230404065429.3381075-1-vikas.srivastava@intel.com> References: <20230404065429.3381075-1-vikas.srivastava@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 4/4 v3] tests/i915/gem_userptr_blits: Enable XY_FAST_COPY_BLT command for gen12+ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Test case uses legacy command XY_SRC_COPY_BLT_CMD which is not supported on newer platforms. Modify test to use XY_FAST_COPY_BLT. Signed-off-by: Vikas Srivastava Cc: Karolina Stolarek --- tests/i915/gem_userptr_blits.c | 102 ++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 39 deletions(-) diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c index 07a453229a..3a1a81e456 100644 --- a/tests/i915/gem_userptr_blits.c +++ b/tests/i915/gem_userptr_blits.c @@ -66,6 +66,7 @@ #include "sw_sync.h" #include "eviction_common.c" +#include "i915/i915_blt.h" #ifndef PAGE_SIZE #define PAGE_SIZE 4096 @@ -99,6 +100,7 @@ static int copy(int fd, uint32_t dst, uint32_t src) struct drm_i915_gem_relocation_entry reloc[2]; struct drm_i915_gem_exec_object2 obj[3]; struct drm_i915_gem_execbuffer2 exec; + static uint32_t devid; uint32_t handle; int ret, i=0; uint64_t dst_offset, src_offset, bb_offset; @@ -108,29 +110,49 @@ static int copy(int fd, uint32_t dst, uint32_t src) dst_offset = bb_offset + 4096; src_offset = dst_offset + WIDTH * HEIGHT * sizeof(uint32_t) * (src != dst); - batch[i++] = XY_SRC_COPY_BLT_CMD | - XY_SRC_COPY_BLT_WRITE_ALPHA | - XY_SRC_COPY_BLT_WRITE_RGB; - if (intel_gen(intel_get_drm_devid(fd)) >= 8) - batch[i - 1] |= 8; - else - batch[i - 1] |= 6; - - batch[i++] = (3 << 24) | /* 32 bits */ - (0xcc << 16) | /* copy ROP */ - WIDTH*4; - batch[i++] = 0; /* dst x1,y1 */ - batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ - batch[i++] = dst_offset; /* dst reloc */ - if (intel_gen(intel_get_drm_devid(fd)) >= 8) - batch[i++] = dst_offset >> 32; - batch[i++] = 0; /* src x1,y1 */ - batch[i++] = WIDTH*4; - batch[i++] = src_offset; /* src reloc */ - if (intel_gen(intel_get_drm_devid(fd)) >= 8) - batch[i++] = src_offset >> 32; - batch[i++] = MI_BATCH_BUFFER_END; - batch[i++] = MI_NOOP; + devid = intel_get_drm_devid(fd); + + if (blt_has_xy_src_copy(fd)) { + batch[i++] = XY_SRC_COPY_BLT_CMD | + XY_SRC_COPY_BLT_WRITE_ALPHA | + XY_SRC_COPY_BLT_WRITE_RGB; + + if (intel_gen(devid) >= 8) + batch[i - 1] |= 8; + else + batch[i - 1] |= 6; + + batch[i++] = (3 << 24) | /* 32 bits */ + (0xcc << 16) | /* copy ROP */ + WIDTH * 4; + batch[i++] = 0; /* dst x1,y1 */ + batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ + batch[i++] = lower_32_bits(dst_offset); /* dst reloc*/ + if (intel_gen(devid) >= 8) + batch[i++] = upper_32_bits(CANONICAL(dst_offset)); + batch[i++] = 0; /* src x1,y1 */ + batch[i++] = WIDTH * 4; + batch[i++] = lower_32_bits(src_offset); /* src reloc */ + if (intel_gen(devid) >= 8) + batch[i++] = upper_32_bits(CANONICAL(src_offset)); + batch[i++] = MI_BATCH_BUFFER_END; + batch[i++] = MI_NOOP; + } else if (blt_has_fast_copy(fd)) { + batch[i++] = XY_FAST_COPY_BLT; + batch[i++] = XY_FAST_COPY_COLOR_DEPTH_32 | WIDTH * 4; + batch[i++] = 0;/* dst x1,y1 */ + batch[i++] = (HEIGHT << 16) | WIDTH;/* dst x2,y2 */ + batch[i++] = lower_32_bits(dst_offset); /* dst address */ + batch[i++] = upper_32_bits(CANONICAL(dst_offset)); + batch[i++] = 0;/* src x1,y1 */ + batch[i++] = WIDTH * 4;/* src pitch */ + batch[i++] = lower_32_bits(src_offset); /* src address */ + batch[i++] = upper_32_bits(CANONICAL(src_offset)); + batch[i++] = MI_BATCH_BUFFER_END; + batch[i++] = MI_NOOP; + } else { + igt_assert_f(0, "No supported blit command found\n"); + } handle = gem_create(fd, 4096); gem_write(fd, handle, 0, batch, sizeof(batch)); @@ -254,20 +276,7 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo) reloc[1].read_domains = I915_GEM_DOMAIN_RENDER; reloc[1].write_domain = 0; - if (intel_graphics_ver(devid) >= IP_VER(12, 60)) { - batch[i++] = XY_FAST_COPY_BLT; - batch[i++] = XY_FAST_COPY_COLOR_DEPTH_32 | WIDTH*4; - batch[i++] = 0; /* dst x1,y1 */ - batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ - batch[i++] = lower_32_bits(dst_offset); /* dst address */ - batch[i++] = upper_32_bits(CANONICAL(dst_offset)); - batch[i++] = 0; /* src x1,y1 */ - batch[i++] = WIDTH*4; /* src pitch */ - batch[i++] = lower_32_bits(src_offset); /* src address */ - batch[i++] = upper_32_bits(CANONICAL(src_offset)); - batch[i++] = MI_BATCH_BUFFER_END; - batch[i++] = MI_NOOP; - } else { + if (blt_has_xy_src_copy(fd)) { batch[i++] = XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA | XY_SRC_COPY_BLT_WRITE_RGB; @@ -277,19 +286,34 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo) batch[i - 1] |= 6; batch[i++] = (3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ - WIDTH*4; + WIDTH * 4; batch[i++] = 0; /* dst x1,y1 */ batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ batch[i++] = lower_32_bits(dst_offset); if (intel_gen(devid) >= 8) batch[i++] = upper_32_bits(CANONICAL(dst_offset)); batch[i++] = 0; /* src x1,y1 */ - batch[i++] = WIDTH*4; + batch[i++] = WIDTH * 4; batch[i++] = lower_32_bits(src_offset); if (intel_gen(devid) >= 8) batch[i++] = upper_32_bits(CANONICAL(src_offset)); batch[i++] = MI_BATCH_BUFFER_END; batch[i++] = MI_NOOP; + } else if (blt_has_fast_copy(fd)) { + batch[i++] = XY_FAST_COPY_BLT; + batch[i++] = XY_FAST_COPY_COLOR_DEPTH_32 | WIDTH * 4; + batch[i++] = 0; /* dst x1,y1 */ + batch[i++] = (HEIGHT << 16) | WIDTH; /* dst x2,y2 */ + batch[i++] = lower_32_bits(dst_offset); /* dst address */ + batch[i++] = upper_32_bits(CANONICAL(dst_offset)); + batch[i++] = 0; /* src x1,y1 */ + batch[i++] = WIDTH * 4; /* src pitch */ + batch[i++] = lower_32_bits(src_offset); /* src address */ + batch[i++] = upper_32_bits(CANONICAL(src_offset)); + batch[i++] = MI_BATCH_BUFFER_END; + batch[i++] = MI_NOOP; + } else { + igt_assert_f(0, "No supported blit command found\n"); } gem_write(fd, handle, 0, batch, sizeof(batch)); -- 2.25.1