diff options
| author | Mika Kahola <mika.kahola@intel.com> | 2016-11-29 15:45:23 +0200 |
|---|---|---|
| committer | Mika Kahola <mika.kahola@intel.com> | 2016-12-07 14:05:58 +0200 |
| commit | 3e2a75330bb02525fd55e389df9d2be7c9ce154f (patch) | |
| tree | da2e64f749be21397d04de9c0ec617c62fc1e547 | |
| parent | 1e6fc785331b807bec65773681a5efc5a1e1f226 (diff) | |
tests/kms_plane_multiple: Fix CRC based atomic correctness test
Fixes issues on kms_plane_multiple i-g-t test found when running CI tests
v1:
- don't use tiling for cursor plane (Ville)
- for y/yf tiling check that the platform is at least GEN9 (Ville)
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
| -rw-r--r-- | tests/kms_plane_multiple.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c index bedee168..5e12be45 100644 --- a/tests/kms_plane_multiple.c +++ b/tests/kms_plane_multiple.c @@ -210,7 +210,7 @@ prepare_planes(data_t *data, enum pipe pipe, color_t *color, igt_create_color_fb(data->drm_fd, size[i], size[i], data->plane[i]->is_cursor ? DRM_FORMAT_ARGB8888 : DRM_FORMAT_XRGB8888, - tiling, + data->plane[i]->is_cursor ? LOCAL_DRM_FORMAT_MOD_NONE : tiling, color->red, color->green, color->blue, &data->fb[i]); @@ -349,6 +349,7 @@ test_plane_position(data_t *data, enum pipe pipe, bool atomic, int max_planes, { igt_output_t *output; int connected_outs; + int devid = intel_get_drm_devid(data->drm_fd); if (atomic) igt_require(data->display.is_atomic); @@ -356,6 +357,10 @@ test_plane_position(data_t *data, enum pipe pipe, bool atomic, int max_planes, igt_skip_on(pipe >= data->display.n_pipes); igt_skip_on(max_planes >= data->display.pipes[pipe].n_planes); + if ((tiling == LOCAL_I915_FORMAT_MOD_Y_TILED || + tiling == LOCAL_I915_FORMAT_MOD_Yf_TILED)) + igt_require(AT_LEAST_GEN(devid, 9)); + if (!opt.user_seed) opt.seed = time(NULL); |