diff options
author | José Roberto de Souza <jose.souza@intel.com> | 2020-05-28 16:33:53 -0700 |
---|---|---|
committer | José Roberto de Souza <jose.souza@intel.com> | 2020-06-01 11:08:25 -0700 |
commit | bea881189520a9cccbb1c1cb454ac5b6fdaea40e (patch) | |
tree | 004f3037d31ddd222938c16e0cdf447631da74a2 /tests | |
parent | 587cbed206689abbad60689d4a32bf9caf0cc124 (diff) |
tests/kms_fbcon_fbt: When restoring fbcon always set mode to text mode
If by some reason or tests, this tests is executed and VT mode is
already in KD_GRAPHICS the call to kmstest_set_vt_graphics_mode() will
set orig_vt_mode as KD_GRAPHICS and when it was calling
kmstest_restore_vt_mode() it would set KD_GRAPHICS again not returning
to fbcon and causing the test to fail.
As it can be seen here:
(kms_fbcon_fbt:11004) igt_kms-DEBUG: VT: graphics mode set (mode was 0x1)"
https://intel-gfx-ci.01.org/tree/drm-tip/drmtip_499/fi-ehl-1/igt@kms_fbcon_fbt@fbc.html
So here adding a new function to alaways set mode the KD_TEXT when we
want to restore to fbcon.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_fbcon_fbt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c index e6dd4353b..e99a1f2f2 100644 --- a/tests/kms_fbcon_fbt.c +++ b/tests/kms_fbcon_fbt.c @@ -283,7 +283,7 @@ static void restore_fbcon(struct drm_info *drm) kmstest_unset_all_crtcs(drm->fd, drm->res); igt_remove_fb(drm->fd, &drm->fb); igt_device_drop_master(drm->fd); - kmstest_restore_vt_mode(); + kmstest_set_vt_text_mode(); } static void subtest(struct drm_info *drm, struct feature *feature, bool suspend) |