diff options
| author | Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> | 2019-04-10 14:32:03 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-04-11 10:37:49 +0200 |
| commit | 3e13d994529652fa63d3cf69cfa07bca121dd090 (patch) | |
| tree | 1713c07b4e4c213cb7d8b4663bac2daa55678812 /tests | |
| parent | ff8929d4d5b57b544e699fa428930f0fd66dd2dc (diff) | |
igt/tests: Remove redundant alpha retry
Using igt_plane_has_format_mod allows to save
time not doing redundant retry, knowing if
plane supports alpha beforehand.
v2: Remove unneeded assertion also.
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_atomic_transition.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 18f73317..6f16a928 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -232,6 +232,9 @@ static void setup_parms(igt_display_t *display, enum pipe pipe, parms[i].height = cursor_height; parms[i].mask = 1 << 1; } else { + if (!n_overlays) + alpha = igt_plane_has_format_mod(plane, + DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE); parms[i].fb = sprite_fb; parms[i].mask = 1 << 2; @@ -272,7 +275,6 @@ static void setup_parms(igt_display_t *display, enum pipe pipe, * Pre gen9 not all sizes are supported, find the biggest possible * size that can be enabled on all sprite planes. */ -retry: prev_w = sprite_width = cursor_width; prev_h = sprite_height = cursor_height; @@ -290,16 +292,6 @@ retry: igt_assert(!is_atomic_check_failure_errno(ret)); if (is_atomic_check_plane_size_errno(ret)) { - if (cursor_width == sprite_width && - cursor_height == sprite_height) { - igt_assert_f(alpha, - "Cannot configure the test with all sprite planes enabled\n"); - - /* retry once with XRGB format. */ - alpha = false; - goto retry; - } - sprite_width = prev_w; sprite_height = prev_h; |