diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-07-16 13:59:15 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-11-11 19:50:50 +0200 |
| commit | 2a1acd22d533d45019e2e0be4682de7d2e5a7105 (patch) | |
| tree | 7274a2295aac325bb43c17c55cfd737a28a0e6a6 /tests/i915/kms_big_fb.c | |
| parent | bfca9b6113eb21d843d6e398b5f47d630cd6d135 (diff) | |
tests/kms_big_fb: Move format/modifier checks lower
No reason to keep repeating the same format checks multiple
times. Just move them into test_scanout().
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tests/i915/kms_big_fb.c')
| -rw-r--r-- | tests/i915/kms_big_fb.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c index 5f0c2c61..7b414075 100644 --- a/tests/i915/kms_big_fb.c +++ b/tests/i915/kms_big_fb.c @@ -575,6 +575,11 @@ static void test_scanout(data_t *data) { igt_output_t *output; + igt_require(data->format == DRM_FORMAT_C8 || + igt_fb_supported_format(data->format)); + + igt_require(igt_display_has_format_mod(&data->display, data->format, data->modifier)); + if (data->max_hw_stride_test) { data->big_fb_width = data->max_hw_fb_width; data->big_fb_height = 0; @@ -904,12 +909,8 @@ igt_main igt_describe("Sanity check if addfb ioctl works correctly for given " "combination of modifier formats and rotation"); igt_subtest_f("%s-%dbpp-rotate-%d", modifiers[i].name, - formats[j].bpp, rotations[k].angle) { - igt_require(data.format == DRM_FORMAT_C8 || - igt_fb_supported_format(data.format)); - igt_require(igt_display_has_format_mod(&data.display, data.format, data.modifier)); + formats[j].bpp, rotations[k].angle) test_scanout(&data); - } } igt_fixture @@ -962,9 +963,6 @@ igt_main data.max_hw_fb_width = min(data.hw_stride / (formats[j].bpp >> 3), data.max_fb_width); } - igt_require(data.format == DRM_FORMAT_C8 || - igt_fb_supported_format(data.format)); - igt_require(igt_display_has_format_mod(&data.display, data.format, data.modifier)); test_scanout(&data); } @@ -976,9 +974,6 @@ igt_main igt_describe("test async flip on maximum hardware supported stride length for given bpp and modifiers."); igt_subtest_f("%s-max-hw-stride-%dbpp-rotate-%d%s-async-flip", modifiers[i].name, formats[j].bpp, rotations[k].angle, fliptab[l].flipname) { - igt_require(data.format == DRM_FORMAT_C8 || - igt_fb_supported_format(data.format)); - igt_require(igt_display_has_format_mod(&data.display, data.format, data.modifier)); igt_require(igt_has_drm_cap(data.drm_fd, DRM_CAP_ASYNC_PAGE_FLIP)); data.max_hw_fb_width = min(data.hw_stride / (formats[j].bpp >> 3), data.max_fb_width); test_scanout(&data); |