On 04/22, Maxime Ripard wrote:
> Hi!
>
> On Tue, Apr 21, 2020 at 05:07:05PM -0400, Rodrigo Siqueira wrote:
> > On 04/15, Maxime Ripard wrote:
> > > On Mon, Oct 21, 2019 at 10:00:39PM -0300, Brian Starkey wrote:
> > > > Add a test which makes commits using the writeback connector, and
> > > > checks the output buffer hash to make sure it is/isn't written as
> > > > appropriate.
> > > >
> > > > V6: Simon Ser
> > > > - Add igt documentation with igt_describe
> > > > - Replace int ret by unsigned int fd_id when calling igt_create_fb
> > > > - Add a descriptive error message if sync_fence_wait fail
> > > > - Replace color_idx variable by i
> > > > - Use in_fb instead of out_fb for getting the expected CRC
> > > > - Drop unnecessary parentheses
> > > > - Replace igt_fb_mod_to_tiling to DRM_FORMAT_MOD_LINEAR
> > > >
> > > > Signed-off-by: Brian Starkey <brian.starkey@xxxxxxx>
> > > > [rebased and updated the patch to address feedback]
> > > > Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx>
> > > > ---
> > > > tests/kms_writeback.c | 123 ++++++++++++++++++++++++++++++++++++++++++
> > > > 1 file changed, 123 insertions(+)
> > > >
> > > > diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
> > > > index a373ec4d..068595b9 100644
> > > > --- a/tests/kms_writeback.c
> > > > +++ b/tests/kms_writeback.c
> > > > @@ -30,6 +30,7 @@
> > > > #include "igt.h"
> > > > #include "igt_core.h"
> > > > #include "igt_fb.h"
> > > > +#include "sw_sync.h"
> > > >
> > > > IGT_TEST_DESCRIPTION("Exercise writeback feature.");
> > > >
> > > > @@ -196,6 +197,115 @@ static void writeback_test_fb(igt_output_t *output, igt_fb_t *valid_fb, igt_fb_t
> > > > igt_assert(ret == -EINVAL);
> > > > }
> > > >
> > > > +static void fill_fb(igt_fb_t *fb, double color[3])
> > > > +{
> > > > + cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
> > > > + igt_assert(cr);
> > > > +
> > > > + igt_paint_color(cr, 0, 0, fb->width, fb->height,
> > > > + color[0], color[1], color[2]);
> > > > +}
> > > > +
> > >
> > > On which platform did you test this? On Arm (but I would assume
> > > anything !i915), this will fire up an assert.
> > >
> > > I've replaced this with a igt_fb_map_buffer/memset, and it works as
> > > expected.
> >
> > Could you share your fix for this issue? Since you already have a
> > solution that you know that works on ARM, I can just use it for avoiding
> > an unnecessary round of review in the next version.
>
> Sure, you'll find it attached
Thanks!
I'm going to submit a new version today.
Best Regards
> Maxime
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 97a656c8..be825220 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -3812,12 +3812,9 @@ int igt_fb_get_crc(struct igt_fb *fb, igt_crc_t *crc)
> if (fb->num_planes != 1)
> return -EINVAL;
>
> - if (fb->is_dumb)
> - ptr = kmstest_dumb_map_buffer(fb->fd, fb->gem_handle, fb->size,
> - PROT_READ);
> - else
> - ptr = gem_mmap__gtt(fb->fd, fb->gem_handle, fb->size,
> - PROT_READ);
> + ptr = igt_fb_map_buffer(fb->fd, fb);
> + igt_assert(ptr);
> + map = ptr;
>
> /*
> * Framebuffers are often uncached, which can make byte-wise accesses
> @@ -3846,7 +3843,7 @@ int igt_fb_get_crc(struct igt_fb *fb, igt_crc_t *crc)
> crc->crc[0] = hash;
>
> free(line);
> - munmap(map, fb->size);
> + igt_fb_unmap_buffer(fb, map);
>
> return 0;
> #undef FNV1a_OFFSET_BIAS
> diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
> index 068595b9..c2ee05dd 100644
> --- a/tests/kms_writeback.c
> +++ b/tests/kms_writeback.c
> @@ -149,7 +149,7 @@ static int do_writeback_test(igt_output_t *output, uint32_t fb_id,
>
> igt_output_set_prop_value(output, IGT_CONNECTOR_CRTC_ID, config->crtc->crtc_id);
> igt_output_set_prop_value(output, IGT_CONNECTOR_WRITEBACK_FB_ID, fb_id);
> - igt_output_set_prop_value(output, IGT_CONNECTOR_WRITEBACK_OUT_FENCE_PTR, (uint64_t)out_fence_ptr);
> + igt_output_set_prop_value(output, IGT_CONNECTOR_WRITEBACK_OUT_FENCE_PTR, (uint64_t)(uintptr_t)out_fence_ptr);
>
> if (ptr_valid)
> *out_fence_ptr = 0;
> @@ -197,13 +197,18 @@ static void writeback_test_fb(igt_output_t *output, igt_fb_t *valid_fb, igt_fb_t
> igt_assert(ret == -EINVAL);
> }
>
> -static void fill_fb(igt_fb_t *fb, double color[3])
> +static void fill_fb(igt_fb_t *fb, uint32_t pixel)
> {
> - cairo_t *cr = igt_get_cairo_ctx(fb->fd, fb);
> - igt_assert(cr);
> + void *ptr;
>
> - igt_paint_color(cr, 0, 0, fb->width, fb->height,
> - color[0], color[1], color[2]);
> + igt_assert(fb->drm_format == DRM_FORMAT_XRGB8888);
> +
> + ptr = igt_fb_map_buffer(fb->fd, fb);
> + igt_assert(ptr);
> +
> + memset(ptr, pixel, fb->strides[0] * fb->height);
> +
> + igt_fb_unmap_buffer(fb, ptr);
> }
>
> static void get_and_wait_out_fence(igt_output_t *output)
> @@ -222,11 +227,8 @@ static void writeback_sequence(igt_output_t *output, igt_plane_t *plane,
> igt_fb_t *in_fb, igt_fb_t *out_fbs[], int n_commits)
> {
> int i;
> - double in_fb_colors[2][3] = {
> - { 1.0, 0.0, 0.0 },
> - { 0.0, 1.0, 0.0 },
> - };
> - double clear_color[3] = { 1.0, 1.0, 1.0 };
> + uint32_t in_fb_colors[2] = { 0xffff0000, 0xff00ff00 };
> + uint32_t clear_color = 0xffffffff;
> igt_crc_t cleared_crc, out_expected;
>
> for (i = 0; i < n_commits; i++) {
--
Rodrigo Siqueira
https://siqueira.tech
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
