diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-03-19 11:32:49 +0100 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-03-28 13:37:22 +0200 |
commit | 55f945e58fe3c1b28702f9f431b5ce19a4692050 (patch) | |
tree | 2ac759d211ca00ea3f9abfe34f04a235da33ed87 /tests/kms_frontbuffer_tracking.c | |
parent | 0a393229479d61829a2f8671c1a46f533c76b385 (diff) |
tests/kms_frontbuffer_tracking: Fix Y alignment in the scaledprimary subtest, v3.
This is hidden behind the other kms_frontbuffer_tracking failures,
but is its own fail.
On gen9/gen10 we fail the scaledprimary tests because FBC refuses
to be enabled with "plane Y offset is misaligned".
Looking at the kernel, this is a workaround for FIFO underruns
which can be tested as well. Test that with the right alignment, FBC
is enabled and with misalignment FBC is disabled on <= gen10.
Changes since v1:
- Always check both alignments.
Changes since v2:
- Fix gen assignment.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105678
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
Diffstat (limited to 'tests/kms_frontbuffer_tracking.c')
-rw-r--r-- | tests/kms_frontbuffer_tracking.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index 5cba4158..a20e7118 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -2687,8 +2687,10 @@ static void scaledprimary_subtest(const struct test_mode *t) struct igt_fb new_fb, *old_fb; struct modeset_params *params = pick_params(t); struct fb_region *reg = ¶ms->primary; + int gen = intel_gen(intel_get_drm_devid(drm.fd)); + int src_y_upscale = ALIGN(reg->h / 4, 4); - igt_require_f(intel_gen(intel_get_drm_devid(drm.fd)) >= 9, + igt_require_f(gen >= 9, "Can't test primary plane scaling before gen 9\n"); prepare_subtest(t, NULL); @@ -2737,11 +2739,23 @@ static void scaledprimary_subtest(const struct test_mode *t) /* Destination doesn't fill the entire CRTC, upscaling. */ igt_fb_set_position(&new_fb, reg->plane, - reg->x + reg->w / 4, reg->y + reg->h / 4); + reg->x + reg->w / 4, reg->y + src_y_upscale); igt_fb_set_size(&new_fb, reg->plane, reg->w / 2, reg->h / 2); igt_display_commit2(&drm.display, COMMIT_UNIVERSAL); do_assertions(DONT_ASSERT_CRC); + /* + * On gen <= 10 HW, FBC is not enabled on a plane with a Y offset + * that isn't divisible by 4, because it causes FIFO underruns. + * + * Check that FBC is disabled. + */ + igt_fb_set_position(&new_fb, reg->plane, + reg->x + reg->w / 4, reg->y + src_y_upscale + 3); + igt_fb_set_size(&new_fb, reg->plane, reg->w / 2, reg->h / 2); + igt_display_commit2(&drm.display, COMMIT_UNIVERSAL); + do_assertions(DONT_ASSERT_CRC | (gen <= 10 ? ASSERT_FBC_DISABLED : 0)); + /* Back to the good and old blue fb. */ igt_plane_set_fb(reg->plane, old_fb); igt_plane_set_position(params->primary.plane, 0, 0); |