[igt-dev] [PATCH i-g-t v3] tests/kms_psr2_su: add biplanar selective update tests
Hogander, Jouni
jouni.hogander at intel.com
Mon Nov 8 14:40:17 UTC 2021
On Fri, 2021-10-29 at 18:12 +0000, Souza, Jose wrote:
> On Wed, 2021-10-27 at 13:55 +0300, Jouni Högander wrote:
> > Add biplanar formats (NV12, p010) into selective update test.
> > Use also offset for white rectangle as this reveals better
> > possible issues with offset calculation/configuration.
> >
> > v2: Add back skipping of frontbuffer rendering tests
> > v3: Use hyphen instead of underscore in testnames
> >
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> > ---
> > tests/i915/kms_psr2_su.c | 91 +++++++++++++++++++++++++-----------
> > ----
> > 1 file changed, 58 insertions(+), 33 deletions(-)
> >
> > diff --git a/tests/i915/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> > index 91de9bad..d79a1e58 100644
> > --- a/tests/i915/kms_psr2_su.c
> > +++ b/tests/i915/kms_psr2_su.c
>
> I don't think this test is the best one to add tests for biplanar
> formats.
> As PSR2_SU_STATUS do not work on display 13 this test is skipping in
> display 13 and newer so we will not have test coverage for newer
> platforms.
>
> kms_psr2_sf.c is a better one but I would not add one additional test
> for each format to each test in that file, would be better create
> something new.
> Could even do the same that this one is doing but in one page flip
> sending the damaged areas and in the next flip not sending the
> damaged area.
> Something like that stressing corner cases.
This sounds to me like an additional testcase? Doesn't it still make
sense to have automated testcase checking that selective update
actually happens for biplanar plane? Especially as we know there are
separate hook in the code for biplanar plane. Even thought
PSR2_SU_STATUS is not working in all HWs?
> @@ -33,7 +33,8 @@
> >
> > IGT_TEST_DESCRIPTION("Test PSR2 selective update");
> >
> > -#define SQUARE_SIZE 100
> > +#define SQUARE_SIZE 100
> > +#define SQUARE_OFFSET 100
> > /* each selective update block is 4 lines tall */
> > #define EXPECTED_NUM_SU_BLOCKS ((SQUARE_SIZE / 4) + (SQUARE_SIZE %
> > 4 ? 1 : 0))
> >
> > @@ -50,6 +51,23 @@ enum operations {
> > LAST
> > };
> >
> > +static const uint32_t formats_page_flip[] = {
> > +DRM_FORMAT_XRGB8888,
> > +DRM_FORMAT_NV12,
> > +DRM_FORMAT_P010,
> > +DRM_FORMAT_INVALID,
> > +};
> > +
> > +static const uint32_t formats_frontbuffer[] = {
> > +DRM_FORMAT_XRGB8888,
> > +DRM_FORMAT_INVALID,
> > +};
> > +
> > +static const uint32_t *formats[] = {
> > + [PAGE_FLIP] = formats_page_flip,
> > + [FRONTBUFFER] = formats_frontbuffer,
> > +};
> > +
> > static const char *op_str(enum operations op)
> > {
> > static const char * const name[] = {
> > @@ -68,6 +86,7 @@ typedef struct {
> > igt_output_t *output;
> > struct igt_fb fb[2];
> > enum operations op;
> > +uint32_t format;
> > cairo_t *cr;
> > int change_screen_timerfd;
> > uint32_t screen_changes;
> > @@ -111,7 +130,7 @@ static void prepare(data_t *data)
> > /* all green frame */
> > igt_create_color_fb(data->drm_fd,
> > data->mode->hdisplay, data->mode->vdisplay,
> > - DRM_FORMAT_XRGB8888,
> > + data->format,
> > DRM_FORMAT_MOD_LINEAR,
> > 0.0, 1.0, 0.0,
> > &data->fb[0]);
> > @@ -121,14 +140,14 @@ static void prepare(data_t *data)
> >
> > igt_create_color_fb(data->drm_fd,
> > data->mode->hdisplay, data->mode->vdisplay,
> > - DRM_FORMAT_XRGB8888,
> > + data->format,
> > DRM_FORMAT_MOD_LINEAR,
> > 0.0, 1.0, 0.0,
> > &data->fb[1]);
> >
> > cr = igt_get_cairo_ctx(data->drm_fd, &data->fb[1]);
> > /* paint a white square */
> > -igt_paint_color_alpha(cr, 0, 0, SQUARE_SIZE, SQUARE_SIZE,
> > +igt_paint_color_alpha(cr, SQUARE_OFFSET, SQUARE_OFFSET,
> > SQUARE_SIZE, SQUARE_SIZE,
> > 1.0, 1.0, 1.0, 1.0);
> > igt_put_cairo_ctx(cr);
> > } else if (data->op == FRONTBUFFER) {
> > @@ -152,8 +171,8 @@ static bool update_screen_and_test(data_t
> > *data)
> > struct drm_mode_rect clip;
> > igt_plane_t *primary;
> >
> > -clip.x1 = clip.y1 = 0;
> > -clip.x2 = clip.y2 = SQUARE_SIZE;
> > +clip.x1 = clip.y1 = SQUARE_OFFSET;
> > +clip.x2 = clip.y2 = SQUARE_OFFSET + SQUARE_SIZE;
> >
> > primary = igt_output_get_plane_type(data->output,
> > DRM_PLANE_TYPE_PRIMARY);
> > @@ -167,16 +186,18 @@ static bool update_screen_and_test(data_t
> > *data)
> > case FRONTBUFFER: {
> > drmModeClip clip;
> >
> > -clip.x1 = clip.y1 = 0;
> > -clip.x2 = clip.y2 = SQUARE_SIZE;
> > +clip.x1 = clip.y1 = SQUARE_OFFSET;
> > +clip.x2 = clip.y2 = SQUARE_OFFSET + SQUARE_SIZE;
> >
> > if (data->screen_changes & 1) {
> > /* go back to all green frame with a square */
> > -igt_paint_color_alpha(data->cr, 0, 0, SQUARE_SIZE,
> > +igt_paint_color_alpha(data->cr, SQUARE_OFFSET,
> > + SQUARE_OFFSET, SQUARE_SIZE,
> > SQUARE_SIZE, 1.0, 1.0, 1.0, 1.0);
> > } else {
> > /* go back to all green frame */
> > -igt_paint_color_alpha(data->cr, 0, 0, SQUARE_SIZE,
> > +igt_paint_color_alpha(data->cr, SQUARE_OFFSET,
> > + SQUARE_OFFSET, SQUARE_SIZE,
> > SQUARE_SIZE, 0, 1.0, 0, 1.0);
> > }
> >
> > @@ -261,6 +282,7 @@ igt_main
> > data.debugfs_fd, PSR_MODE_2),
> > "Error enabling PSR2\n");
> > data.op = FRONTBUFFER;
> > +data.format = DRM_FORMAT_XRGB8888;
> > prepare(&data);
> > r = psr_wait_entry(data.debugfs_fd, PSR_MODE_2);
> > cleanup(&data);
> > @@ -281,31 +303,34 @@ igt_main
> > }
> >
> > for (data.op = PAGE_FLIP; data.op < LAST; data.op++) {
> > -igt_describe("Test that selective update works when screen
> > changes");
> > -igt_subtest_f("%s", op_str(data.op)) {
> > -
> > -if (data.op == FRONTBUFFER &&
> > - intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 12) {
> > -/*
> > - * FIXME: Display 12+ platforms now have PSR2
> > - * selective fetch enabled by default but we
> > - * still can't properly handle frontbuffer
> > - * rendering, so right it does full frame
> > - * fetches at every frontbuffer rendering.
> > - * So it is expected that this test will fail
> > - * in display 12+ platform fow now.
> > - */
> > -igt_skip("PSR2 selective fetch is doing full frame fetches for
> > frontbuffer rendering\n");
> > +const uint32_t *format = formats[data.op];
> > +
> > +while (*format != DRM_FORMAT_INVALID) {
> > +data.format = *format++;
> > +igt_describe("Test that selective update works when screen
> > changes");
> > +igt_subtest_f("%s-%s", op_str(data.op),
> > igt_format_str(data.format)) {
> > +if (data.op == FRONTBUFFER &&
> > + intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 12) {
> > +/*
> > + * FIXME: Display 12+ platforms now have PSR2
> > + * selective fetch enabled by default but we
> > + * still can't properly handle frontbuffer
> > + * rendering, so right it does full frame
> > + * fetches at every frontbuffer rendering.
> > + * So it is expected that this test will fail
> > + * in display 12+ platform for now.
> > + */
> > +igt_skip("PSR2 selective fetch is doing full frame fetches for
> > frontbuffer rendering\n");
> > +}
> > +prepare(&data);
> > +run(&data);
> > +cleanup(&data);
> > }
> > -
> > -prepare(&data);
> > -run(&data);
> > -cleanup(&data);
> > }
> > -}
> >
> > -igt_fixture {
> > -close(data.debugfs_fd);
> > -display_fini(&data);
> > +igt_fixture {
> > +close(data.debugfs_fd);
> > +display_fini(&data);
> > +}
> > }
> > }
More information about the igt-dev
mailing list