From: Matthew Auld <matthew.auld@intel.com> To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Dominik Grzegorzek <dominik.grzegorzek@intel.com>, Andrzej Turko <andrzej.turko@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t v3 7/9] tests/i915/gem_media_fill: Use memory region interface Date: Wed, 26 May 2021 14:00:23 +0100 [thread overview] Message-ID: <20210526130025.249629-7-matthew.auld@intel.com> (raw) In-Reply-To: <20210526130025.249629-1-matthew.auld@intel.com> From: Andrzej Turko <andrzej.turko@linux.intel.com> Converted the test gem_media_fill to use memory region uapi. Signed-off-by: Andrzej Turko <andrzej.turko@linux.intel.com> Cc: Zbigniew Kempczynski <zbigniew.kempczynski@intel.com> Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com> Cc: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Acked-by: Petri Latvala <petri.latvala@intel.com> Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> --- tests/i915/gem_media_fill.c | 57 ++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/tests/i915/gem_media_fill.c b/tests/i915/gem_media_fill.c index 24d17fab..28c18e79 100644 --- a/tests/i915/gem_media_fill.c +++ b/tests/i915/gem_media_fill.c @@ -64,21 +64,24 @@ typedef struct { } data_t; static struct intel_buf * -create_buf(data_t *data, int width, int height, uint8_t color) +create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region) { struct intel_buf *buf; + uint32_t handle; uint8_t *ptr; int i; buf = calloc(1, sizeof(*buf)); igt_assert(buf); + handle = gem_create_in_memory_regions(data->drm_fd, SIZE, region); + /* * Legacy code uses 32 bpp after buffer creation. * Let's do the same due to keep shader intact. */ - intel_buf_init(data->bops, buf, width/4, height, 32, 0, - I915_TILING_NONE, 0); + intel_buf_init_using_handle(data->bops, handle, buf, width/4, + height, 32, 0, I915_TILING_NONE, 0); ptr = gem_mmap__cpu_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_WRITE); @@ -101,13 +104,16 @@ static void buf_check(uint8_t *ptr, int x, int y, uint8_t color) color, val, x, y); } -static void media_fill(data_t *data, igt_fillfunc_t fill) +static void media_fill(data_t *data, igt_fillfunc_t fill, + struct igt_collection *memregion_set) { struct intel_buf *buf; + uint32_t region; uint8_t *ptr; int i, j; - buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4); + region = igt_collection_get_value(memregion_set, 0); + buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4, region); ptr = gem_mmap__device_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_READ); for (i = 0; i < WIDTH; i++) @@ -126,20 +132,45 @@ static void media_fill(data_t *data, igt_fillfunc_t fill) munmap(ptr, buf->surface[0].size); } -igt_simple_main +igt_main { data_t data = {0, }; igt_fillfunc_t fill_fn = NULL; + struct drm_i915_query_memory_regions *query_info; + struct igt_collection *set, *region_set; + + igt_fixture { + data.drm_fd = drm_open_driver_render(DRIVER_INTEL); + igt_require_gem(data.drm_fd); + + data.devid = intel_get_drm_devid(data.drm_fd); + data.bops = buf_ops_create(data.drm_fd); + + fill_fn = igt_get_media_fillfunc(data.devid); + + igt_require_f(fill_fn, "no media-fill function\n"); + + query_info = gem_get_query_memory_regions(data.drm_fd); + igt_assert(query_info); + + set = get_memory_region_set(query_info, + I915_SYSTEM_MEMORY); - data.drm_fd = drm_open_driver_render(DRIVER_INTEL); - igt_require_gem(data.drm_fd); + igt_fork_hang_detector(data.drm_fd); + } - data.devid = intel_get_drm_devid(data.drm_fd); - data.bops = buf_ops_create(data.drm_fd); + igt_subtest_with_dynamic("media-fill") + for_each_combination(region_set, 1, set) { + char *sub_name = memregion_dynamic_subtest_name(region_set); - fill_fn = igt_get_media_fillfunc(data.devid); + igt_dynamic_f("%s", sub_name) + media_fill(&data, fill_fn, region_set); - igt_require_f(fill_fn, "no media-fill function\n"); + free(sub_name); + } - media_fill(&data, fill_fn); + igt_fixture { + igt_collection_destroy(set); + igt_stop_hang_detector(); + } } -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Petri Latvala <petri.latvala@intel.com> Subject: [igt-dev] [PATCH i-g-t v3 7/9] tests/i915/gem_media_fill: Use memory region interface Date: Wed, 26 May 2021 14:00:23 +0100 [thread overview] Message-ID: <20210526130025.249629-7-matthew.auld@intel.com> (raw) In-Reply-To: <20210526130025.249629-1-matthew.auld@intel.com> From: Andrzej Turko <andrzej.turko@linux.intel.com> Converted the test gem_media_fill to use memory region uapi. Signed-off-by: Andrzej Turko <andrzej.turko@linux.intel.com> Cc: Zbigniew Kempczynski <zbigniew.kempczynski@intel.com> Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com> Cc: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Acked-by: Petri Latvala <petri.latvala@intel.com> Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> --- tests/i915/gem_media_fill.c | 57 ++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/tests/i915/gem_media_fill.c b/tests/i915/gem_media_fill.c index 24d17fab..28c18e79 100644 --- a/tests/i915/gem_media_fill.c +++ b/tests/i915/gem_media_fill.c @@ -64,21 +64,24 @@ typedef struct { } data_t; static struct intel_buf * -create_buf(data_t *data, int width, int height, uint8_t color) +create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region) { struct intel_buf *buf; + uint32_t handle; uint8_t *ptr; int i; buf = calloc(1, sizeof(*buf)); igt_assert(buf); + handle = gem_create_in_memory_regions(data->drm_fd, SIZE, region); + /* * Legacy code uses 32 bpp after buffer creation. * Let's do the same due to keep shader intact. */ - intel_buf_init(data->bops, buf, width/4, height, 32, 0, - I915_TILING_NONE, 0); + intel_buf_init_using_handle(data->bops, handle, buf, width/4, + height, 32, 0, I915_TILING_NONE, 0); ptr = gem_mmap__cpu_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_WRITE); @@ -101,13 +104,16 @@ static void buf_check(uint8_t *ptr, int x, int y, uint8_t color) color, val, x, y); } -static void media_fill(data_t *data, igt_fillfunc_t fill) +static void media_fill(data_t *data, igt_fillfunc_t fill, + struct igt_collection *memregion_set) { struct intel_buf *buf; + uint32_t region; uint8_t *ptr; int i, j; - buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4); + region = igt_collection_get_value(memregion_set, 0); + buf = create_buf(data, WIDTH, HEIGHT, COLOR_C4, region); ptr = gem_mmap__device_coherent(data->drm_fd, buf->handle, 0, buf->surface[0].size, PROT_READ); for (i = 0; i < WIDTH; i++) @@ -126,20 +132,45 @@ static void media_fill(data_t *data, igt_fillfunc_t fill) munmap(ptr, buf->surface[0].size); } -igt_simple_main +igt_main { data_t data = {0, }; igt_fillfunc_t fill_fn = NULL; + struct drm_i915_query_memory_regions *query_info; + struct igt_collection *set, *region_set; + + igt_fixture { + data.drm_fd = drm_open_driver_render(DRIVER_INTEL); + igt_require_gem(data.drm_fd); + + data.devid = intel_get_drm_devid(data.drm_fd); + data.bops = buf_ops_create(data.drm_fd); + + fill_fn = igt_get_media_fillfunc(data.devid); + + igt_require_f(fill_fn, "no media-fill function\n"); + + query_info = gem_get_query_memory_regions(data.drm_fd); + igt_assert(query_info); + + set = get_memory_region_set(query_info, + I915_SYSTEM_MEMORY); - data.drm_fd = drm_open_driver_render(DRIVER_INTEL); - igt_require_gem(data.drm_fd); + igt_fork_hang_detector(data.drm_fd); + } - data.devid = intel_get_drm_devid(data.drm_fd); - data.bops = buf_ops_create(data.drm_fd); + igt_subtest_with_dynamic("media-fill") + for_each_combination(region_set, 1, set) { + char *sub_name = memregion_dynamic_subtest_name(region_set); - fill_fn = igt_get_media_fillfunc(data.devid); + igt_dynamic_f("%s", sub_name) + media_fill(&data, fill_fn, region_set); - igt_require_f(fill_fn, "no media-fill function\n"); + free(sub_name); + } - media_fill(&data, fill_fn); + igt_fixture { + igt_collection_destroy(set); + igt_stop_hang_detector(); + } } -- 2.26.3 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-05-26 13:00 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-26 13:00 [Intel-gfx] [PATCH i-g-t v3 1/9] i915_drm.h sync Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 2/9] lib/i915/gem_create: Add gem_create_ext Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 3/9] lib/i915/intel_memory_region: Add new memory region lib Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 4/9] tests/gem_gpgpu_fill: Convert from simple to standard igt_main Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 5/9] tests/i915/gem_exec_basic: Use memory region interface Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 6/9] tests/i915/gem_gpgpu_fill: " Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` Matthew Auld [this message] 2021-05-26 13:00 ` [igt-dev] [PATCH i-g-t v3 7/9] tests/i915/gem_media_fill: " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 8/9] tests/i915/gem_create: exercise placements extension Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 13:00 ` [Intel-gfx] [PATCH i-g-t v3 9/9] tests/i915/gem_exec_basic: Iterate over all memory regions Matthew Auld 2021-05-26 13:00 ` [igt-dev] " Matthew Auld 2021-05-26 15:45 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v3,1/9] i915_drm.h sync Patchwork 2021-05-27 1:01 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210526130025.249629-7-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=andrzej.turko@linux.intel.com \ --cc=dominik.grzegorzek@intel.com \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.