[PATCH i-g-t v2 1/2] lib/igt_draw: Add support for writing onto already mmapped buffer
Zbigniew Kempczyński
zbigniew.kempczynski at intel.com
Fri Apr 12 07:37:56 UTC 2024
On Thu, Apr 11, 2024 at 10:33:11PM +0530, Vandita Kulkarni wrote:
> Provide another draw method, for supporting drawing onto
> already mmapped buffer.
>
> v2: Use fb->fb_map instead of fb->driver_priv (Zbigniew)
>
> Signed-off-by: Vandita Kulkarni <vandita.kulkarni at intel.com>
> ---
> lib/igt_draw.c | 37 ++++++++++++++++++++++++--
> lib/igt_draw.h | 10 ++++++-
> lib/igt_fb.h | 3 +++
> tests/intel/kms_frontbuffer_tracking.c | 2 +-
> 4 files changed, 48 insertions(+), 4 deletions(-)
>
> diff --git a/lib/igt_draw.c b/lib/igt_draw.c
> index 2c01d7b02..8673a6e58 100644
> --- a/lib/igt_draw.c
> +++ b/lib/igt_draw.c
> @@ -75,6 +75,7 @@ struct buf_data {
> uint32_t handle;
> uint32_t size;
> uint32_t stride;
> + void *buf_ptr;
> int width;
> int height;
> int bpp;
> @@ -110,6 +111,8 @@ const char *igt_draw_get_method_name(enum igt_draw_method method)
> return "blt";
> case IGT_DRAW_RENDER:
> return "render";
> + case IGT_DRAW_MMAP_PTR:
> + return "mmap-ptr";
> default:
> igt_assert(false);
> }
> @@ -541,6 +544,27 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,
> igt_assert(gem_munmap(ptr, buf->size) == 0);
> }
>
> +static void draw_rect_mmap_ptr(int fd, struct buf_data *buf, struct rect *rect,
> + uint32_t tiling, uint32_t swizzle, uint32_t color)
> +{
> + igt_assert(buf->buf_ptr != NULL);
> +
> + switch (tiling) {
> + case I915_TILING_NONE:
> + draw_rect_ptr_linear(buf->buf_ptr, buf->stride, rect, color, buf->bpp);
> + break;
> + case I915_TILING_X:
> + case I915_TILING_Y:
> + case I915_TILING_4:
> + draw_rect_ptr_tiled(buf->buf_ptr, buf->stride, tiling, swizzle, rect,
> + color, buf->bpp);
> + break;
> + default:
> + igt_assert(false);
> + break;
> + }
> +}
> +
> static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf,
> struct rect *rect, uint32_t color)
> {
> @@ -839,6 +863,8 @@ static void draw_rect_render(int fd, struct cmd_data *cmd_data,
> * @buf_handle: the handle of the buffer where you're going to draw to
> * @buf_size: the size of the buffer
> * @buf_stride: the stride of the buffer
> + * @buf_ptr: Pointer to already mmapped buffer, to be used with IGT_DRAW_MMAP_PTR,
> + otherwise can be left NULL.
Checkpatch complaints about space before tabs, I think you should use
spaces only here.
> * @buf_width: the width of the buffer
> * @buf_height: the height of the buffer
> * @tiling: the tiling of the buffer
> @@ -855,7 +881,7 @@ static void draw_rect_render(int fd, struct cmd_data *cmd_data,
> */
> void igt_draw_rect(int fd, struct buf_ops *bops, uint32_t ctx,
> uint32_t buf_handle, uint32_t buf_size, uint32_t buf_stride,
> - int buf_width, int buf_height,
> + void *buf_ptr, int buf_width, int buf_height,
> uint32_t tiling, enum igt_draw_method method,
> int rect_x, int rect_y, int rect_w, int rect_h,
> uint32_t color, int bpp)
> @@ -870,6 +896,7 @@ void igt_draw_rect(int fd, struct buf_ops *bops, uint32_t ctx,
> .handle = buf_handle,
> .size = buf_size,
> .stride = buf_stride,
> + .buf_ptr = buf_ptr,
> .width = buf_width,
> .height = buf_height,
> .bpp = bpp,
> @@ -907,6 +934,9 @@ void igt_draw_rect(int fd, struct buf_ops *bops, uint32_t ctx,
> case IGT_DRAW_RENDER:
> draw_rect_render(fd, &cmd_data, &buf, &rect, tiling, color);
> break;
> + case IGT_DRAW_MMAP_PTR:
> + draw_rect_mmap_ptr(fd, &buf, &rect, tiling, swizzle, color);
> + break;
> default:
> igt_assert(false);
> break;
> @@ -935,7 +965,7 @@ void igt_draw_rect_fb(int fd, struct buf_ops *bops,
> int rect_w, int rect_h, uint32_t color)
> {
> igt_draw_rect(fd, bops, ctx, fb->gem_handle, fb->size, fb->strides[0],
> - fb->width, fb->height,
> + fb->fb_map, fb->width, fb->height,
> igt_fb_mod_to_tiling(fb->modifier), method,
> rect_x, rect_y, rect_w, rect_h, color,
> igt_drm_format_to_bpp(fb->drm_format));
> @@ -971,5 +1001,8 @@ bool igt_draw_supports_method(int fd, enum igt_draw_method method)
> if (method == IGT_DRAW_RENDER)
> return !!igt_get_render_copyfunc(intel_get_drm_devid(fd));
>
> + if (method == IGT_DRAW_MMAP_PTR)
> + return (is_i915_device(fd) && gem_has_mappable_ggtt(fd)) || is_xe_device(fd);
> +
I thought WC is enough, how this supposed to work on i915/dg1/dg2?
--
Zbigniew
> return true;
> }
> diff --git a/lib/igt_draw.h b/lib/igt_draw.h
> index 1dec95e86..4979342c0 100644
> --- a/lib/igt_draw.h
> +++ b/lib/igt_draw.h
> @@ -36,6 +36,7 @@
> * @IGT_DRAW_PWRITE: draw using the pwrite ioctl.
> * @IGT_DRAW_BLT: draw using the BLT ring.
> * @IGT_DRAW_RENDER: draw using the render ring.
> + * @IGT_DRAW_MMAP_PTR: draw onto already mmapped buffer.
> * @IGT_DRAW_METHOD_COUNT: useful for iterating through everything.
> */
> enum igt_draw_method {
> @@ -46,6 +47,13 @@ enum igt_draw_method {
> IGT_DRAW_BLT,
> IGT_DRAW_RENDER,
> IGT_DRAW_METHOD_COUNT,
> + /*
> + * NOTE: This enum is placed after IGT_DRAW_METHOD_COUNT in order
> + * to avoid it being used by other tests which test all the DRAW methods
> + * Once we add support for this draw method in all those tests keep it
> + * outside the total count. Some examples are kms_draw_crc, kms_frontbuffer_tracking
> + */
> + IGT_DRAW_MMAP_PTR,
> };
>
> const char *igt_draw_get_method_name(enum igt_draw_method method);
> @@ -54,7 +62,7 @@ bool igt_draw_supports_method(int fd, enum igt_draw_method method);
>
> void igt_draw_rect(int fd, struct buf_ops *bops, uint32_t ctx,
> uint32_t buf_handle, uint32_t buf_size, uint32_t buf_stride,
> - int buf_width, int buf_height,
> + void *buf_ptr, int buf_width, int buf_height,
> uint32_t tiling, enum igt_draw_method method,
> int rect_x, int rect_y, int rect_w, int rect_h,
> uint32_t color, int bpp);
> diff --git a/lib/igt_fb.h b/lib/igt_fb.h
> index 834aaef54..0dae2b4a4 100644
> --- a/lib/igt_fb.h
> +++ b/lib/igt_fb.h
> @@ -72,6 +72,8 @@ typedef struct _igt_crc igt_crc_t;
> * @domain: current domain for cache flushing tracking on i915.ko
> * @num_planes: Amount of planes on this fb. >1 for planar formats.
> * @strides: line stride for each plane in bytes
> + * @fb_map: Pointer to mmapped buffer, used in case of IGT_DRAW_MMAP_PTR,
> + * can be NULL otherwise.
> * @offsets: Offset for each plane in bytes.
> * @plane_bpp: The bpp for each plane.
> * @plane_width: The width for each plane.
> @@ -96,6 +98,7 @@ typedef struct igt_fb {
> unsigned int domain;
> unsigned int num_planes;
> uint32_t strides[4];
> + uint32_t *fb_map;
> uint32_t offsets[4];
> unsigned int plane_bpp[4];
> unsigned int plane_width[4];
> diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
> index e45d17dd6..32cc50712 100644
> --- a/tests/intel/kms_frontbuffer_tracking.c
> +++ b/tests/intel/kms_frontbuffer_tracking.c
> @@ -2262,7 +2262,7 @@ static void *busy_thread_func(void *data)
> {
> while (!busy_thread.stop)
> igt_draw_rect(drm.fd, drm.bops, 0, busy_thread.handle,
> - busy_thread.size, busy_thread.stride,
> + busy_thread.size, busy_thread.stride, NULL,
> busy_thread.width, busy_thread.height,
> busy_thread.tiling, IGT_DRAW_BLT, 0, 0,
> busy_thread.width, busy_thread.height,
> --
> 2.43.2
>
More information about the igt-dev
mailing list