| Message ID | 1513158652-8912-7-git-send-email-vidya.srinivas@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 13-12-17 om 10:50 schreef Vidya Srinivas: > From: Jyoti Yadav <jyoti.r.yadav@intel.com> > > Patch adds subtest to display primary and overlay planes on two > connected pipes and runs scaling test on both pipes > > Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com> > Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> > Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com> > --- > tests/kms_plane_scaling.c | 114 +++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 112 insertions(+), 2 deletions(-) > > diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c > index b80cafb..bbdf3f3 100644 > --- a/tests/kms_plane_scaling.c > +++ b/tests/kms_plane_scaling.c > @@ -43,9 +43,11 @@ typedef struct { > struct igt_fb fb1; > struct igt_fb fb2; > struct igt_fb fb3; > + struct igt_fb fb4; > int fb_id1; > int fb_id2; > int fb_id3; > + int fb_id4; > > igt_plane_t *plane1; > igt_plane_t *plane2; > @@ -101,6 +103,24 @@ static uint64_t get_tiling(int tiling) > } > } > > +static igt_output_t *get_next_valid_output(igt_display_t *data, int i) > +{ > + int j = 0, valid_output = 0; > + drmModeModeInfo *mode; > + > + for (j = 0; j < data->n_outputs; j++) { > + if (igt_output_is_connected(&data->outputs[j])) { > + mode = igt_output_get_mode(&data->outputs[j]); > + if (mode->hdisplay != 0 && mode->vdisplay != 0) { > + valid_output++; > + if (valid_output == i) > + return &data->outputs[j]; > + } > + } > + } > + return NULL; > +} > + > static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, > igt_plane_t *plane, drmModeModeInfo *mode, enum igt_commit_style s) > { > @@ -545,6 +565,93 @@ test_scaler_with_clipping_clamping_scenario(data_t *d, enum pipe pipe) > } > } > > +static void test_scaler_with_multi_pipe_plane(data_t *d) > +{ > + igt_display_t *display = &d->display; > + igt_output_t *output1, *output2; > + drmModeModeInfo *mode1, *mode2; > + > + output1 = get_next_valid_output(display, 1); > + output2 = get_next_valid_output(display, 2); > + > + igt_skip_on(!output1 || !output2); > + > + igt_output_set_pipe(output1, PIPE_ANY); > + igt_output_set_pipe(output2, PIPE_ANY); > + > + igt_output_set_pipe(output1, 0); > + igt_output_set_pipe(output2, 1); You can't do this, hardcoding pipe 0 (A) and 1(B).. See find_connected_pipe(igt_display_t *display, bool second) in kms_cursor_legacy how to do it correctly. Some outputs may have restraints to which pipe they're connected, and that is completely ignored here. > + d->plane1 = igt_output_get_plane(output1, 0); > + d->plane2 = igt_output_get_plane(output1, 1); > + d->plane3 = igt_output_get_plane(output2, 0); > + d->plane4 = igt_output_get_plane(output2, 1); > + > + mode1 = igt_output_get_mode(output1); > + mode2 = igt_output_get_mode(output2); > + > + d->fb_id1 = igt_create_pattern_fb(d->drm_fd, 600, 600, > + DRM_FORMAT_XRGB8888, > + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb1); > + igt_assert(d->fb_id1); > + > + d->fb_id2 = igt_create_pattern_fb(d->drm_fd, 500, 500, > + DRM_FORMAT_XRGB8888, > + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb2); > + igt_assert(d->fb_id2); > + > + d->fb_id3 = igt_create_pattern_fb(d->drm_fd, 700, 700, > + DRM_FORMAT_XRGB8888, > + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb3); > + igt_assert(d->fb_id3); > + > + d->fb_id4 = igt_create_pattern_fb(d->drm_fd, 400, 400, > + DRM_FORMAT_XRGB8888, > + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb4); > + igt_assert(d->fb_id4); This looks a bit double, how come we don't have a helper for this? > + igt_plane_set_fb(d->plane1, &d->fb1); > + igt_plane_set_fb(d->plane2, &d->fb2); > + igt_plane_set_fb(d->plane3, &d->fb3); > + igt_plane_set_fb(d->plane4, &d->fb4); > + > + /* Upscaling Primary */ > + igt_plane_set_size(d->plane1, mode1->hdisplay, mode1->vdisplay); > + igt_plane_set_size(d->plane3, mode2->hdisplay, mode2->vdisplay); > + igt_display_commit2(display, COMMIT_ATOMIC); > + > + /* Upscaling Sprites */ > + igt_plane_set_size(d->plane2, mode1->hdisplay, mode1->vdisplay); > + igt_plane_set_size(d->plane4, mode2->hdisplay, mode2->vdisplay); > + igt_display_commit2(display, COMMIT_ATOMIC); What about downscale? ~Maarten
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index b80cafb..bbdf3f3 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -43,9 +43,11 @@ typedef struct { struct igt_fb fb1; struct igt_fb fb2; struct igt_fb fb3; + struct igt_fb fb4; int fb_id1; int fb_id2; int fb_id3; + int fb_id4; igt_plane_t *plane1; igt_plane_t *plane2; @@ -101,6 +103,24 @@ static uint64_t get_tiling(int tiling) } } +static igt_output_t *get_next_valid_output(igt_display_t *data, int i) +{ + int j = 0, valid_output = 0; + drmModeModeInfo *mode; + + for (j = 0; j < data->n_outputs; j++) { + if (igt_output_is_connected(&data->outputs[j])) { + mode = igt_output_get_mode(&data->outputs[j]); + if (mode->hdisplay != 0 && mode->vdisplay != 0) { + valid_output++; + if (valid_output == i) + return &data->outputs[j]; + } + } + } + return NULL; +} + static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, igt_plane_t *plane, drmModeModeInfo *mode, enum igt_commit_style s) { @@ -545,6 +565,93 @@ test_scaler_with_clipping_clamping_scenario(data_t *d, enum pipe pipe) } } +static void test_scaler_with_multi_pipe_plane(data_t *d) +{ + igt_display_t *display = &d->display; + igt_output_t *output1, *output2; + drmModeModeInfo *mode1, *mode2; + + output1 = get_next_valid_output(display, 1); + output2 = get_next_valid_output(display, 2); + + igt_skip_on(!output1 || !output2); + + igt_output_set_pipe(output1, PIPE_ANY); + igt_output_set_pipe(output2, PIPE_ANY); + + igt_output_set_pipe(output1, 0); + igt_output_set_pipe(output2, 1); + + d->plane1 = igt_output_get_plane(output1, 0); + d->plane2 = igt_output_get_plane(output1, 1); + d->plane3 = igt_output_get_plane(output2, 0); + d->plane4 = igt_output_get_plane(output2, 1); + + mode1 = igt_output_get_mode(output1); + mode2 = igt_output_get_mode(output2); + + d->fb_id1 = igt_create_pattern_fb(d->drm_fd, 600, 600, + DRM_FORMAT_XRGB8888, + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb1); + igt_assert(d->fb_id1); + + d->fb_id2 = igt_create_pattern_fb(d->drm_fd, 500, 500, + DRM_FORMAT_XRGB8888, + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb2); + igt_assert(d->fb_id2); + + d->fb_id3 = igt_create_pattern_fb(d->drm_fd, 700, 700, + DRM_FORMAT_XRGB8888, + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb3); + igt_assert(d->fb_id3); + + d->fb_id4 = igt_create_pattern_fb(d->drm_fd, 400, 400, + DRM_FORMAT_XRGB8888, + LOCAL_I915_FORMAT_MOD_Y_TILED, &d->fb4); + igt_assert(d->fb_id4); + + igt_plane_set_fb(d->plane1, &d->fb1); + igt_plane_set_fb(d->plane2, &d->fb2); + igt_plane_set_fb(d->plane3, &d->fb3); + igt_plane_set_fb(d->plane4, &d->fb4); + + /* Upscaling Primary */ + igt_plane_set_size(d->plane1, mode1->hdisplay, mode1->vdisplay); + igt_plane_set_size(d->plane3, mode2->hdisplay, mode2->vdisplay); + igt_display_commit2(display, COMMIT_ATOMIC); + + /* Upscaling Sprites */ + igt_plane_set_size(d->plane2, mode1->hdisplay, mode1->vdisplay); + igt_plane_set_size(d->plane4, mode2->hdisplay, mode2->vdisplay); + igt_display_commit2(display, COMMIT_ATOMIC); + + /* disable above 4 planes and cleanup */ + igt_plane_set_fb(d->plane1, NULL); + igt_plane_set_position(d->plane1, 0, 0); + igt_plane_set_fb(d->plane2, NULL); + igt_plane_set_position(d->plane2, 0, 0); + igt_plane_set_fb(d->plane3, NULL); + igt_plane_set_position(d->plane3, 0, 0); + igt_plane_set_fb(d->plane4, NULL); + igt_plane_set_position(d->plane4, 0, 0); + if (d->fb_id1) { + igt_remove_fb(d->drm_fd, &d->fb1); + d->fb_id1 = 0; + } + if (d->fb_id2) { + igt_remove_fb(d->drm_fd, &d->fb2); + d->fb_id2 = 0; + } + if (d->fb_id3) { + igt_remove_fb(d->drm_fd, &d->fb3); + d->fb_id3 = 0; + } + if (d->fb_id4) { + igt_remove_fb(d->drm_fd, &d->fb4); + d->fb_id4 = 0; + } +} + igt_main { data_t data = {}; @@ -580,9 +687,12 @@ igt_main igt_subtest_f("scaler_with_clipping_clamping") { test_scaler_with_clipping_clamping_scenario(&data, pipe); } + } - igt_fixture { + igt_subtest_f("scaler_with_multi_pipe_plane") { + test_scaler_with_multi_pipe_plane(&data); + } + igt_fixture { igt_display_fini(&data.display); - } } }