On Wed, May 19, 2021 at 03:53:35PM +0100, Matthew Auld wrote:
> From: Andrzej Turko <andrzej.turko@xxxxxxxxxxxxxxx>
>
> Converted the test gem_media_fill to use memory region uapi.
>
> Signed-off-by: Andrzej Turko <andrzej.turko@xxxxxxxxxxxxxxx>
> Cc: Zbigniew Kempczynski <zbigniew.kempczynski@xxxxxxxxx>
> Cc: Dominik Grzegorzek <dominik.grzegorzek@xxxxxxxxx>
> Cc: Petri Latvala <petri.latvala@xxxxxxxxx>
> Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@xxxxxxxxx>
--
Zbigniew
> ---
> 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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
