tests/kms_fbcon_fbt: When restoring fbcon always set mode to text mode

1/1

---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
index d4cbc1c53..afef59396 100644
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);
 }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an igt exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void)
+{
+	igt_assert(set_vt_mode(KD_TEXT) >= 0);
+}
 
 static void reset_connectors_at_exit(int sig)
 {

index adca59ac6..32a0e4cc6 100644
@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo *mode);
 int kmstest_get_pipe_from_crtc_id(int fd, int crtc_id);
 void kmstest_set_vt_graphics_mode(void);
 void kmstest_restore_vt_mode(void);
+void kmstest_set_vt_text_mode(void);
 
 enum igt_atomic_crtc_properties {
        IGT_CRTC_BACKGROUND = 0,

index e6dd4353b..e99a1f2f2 100644
@@ -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)

2.26.2

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);  }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an igt
+exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void)
+{
+	igt_assert(set_vt_mode(KD_TEXT) >= 0); }
 
 static void reset_connectors_at_exit(int sig)  { diff --git a/lib/igt_kms.h

@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo *mode);  int

+void kmstest_set_vt_text_mode(void);
 
 enum igt_atomic_crtc_properties {
        IGT_CRTC_BACKGROUND = 0,

@@ -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)
--

---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);  }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an igt
+exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void)
+{
+	igt_assert(set_vt_mode(KD_TEXT) >= 0); }
 
 static void reset_connectors_at_exit(int sig)  { diff --git a/lib/igt_kms.h

@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo *mode);  int

+void kmstest_set_vt_text_mode(void);
 
 enum igt_atomic_crtc_properties {
        IGT_CRTC_BACKGROUND = 0,

@@ -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)
--

---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);  }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an igt
+exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void) {
+	igt_assert(set_vt_mode(KD_TEXT) >= 0); }
 
 static void reset_connectors_at_exit(int sig)  { diff --git

@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo *mode);

@@ -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,

---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);  }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an igt
+exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void) {
+	igt_assert(set_vt_mode(KD_TEXT) >= 0); }
 
 static void reset_connectors_at_exit(int sig)  { diff --git

@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo *mode);

@@ -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,

---
 lib/igt_kms.c         | 11 +++++++++++
 lib/igt_kms.h         |  1 +
 tests/kms_fbcon_fbt.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
@@ -968,6 +968,17 @@ void kmstest_set_vt_graphics_mode(void)
 	igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);  }
 
+/**
+ * kmstest_set_vt_text_mode:
+ *
+ * Sets the controlling VT (if available) into text mode.
+ * Unlikely kmstest_set_vt_graphics_mode() it do not install an
+igt exit
+ * handler to set the VT back to the previous mode.
+ */
+void kmstest_set_vt_text_mode(void) {
+	igt_assert(set_vt_mode(KD_TEXT) >= 0); }
 

 static void reset_connectors_at_exit(int sig)  { diff --git

@@ -93,6 +93,7 @@ void kmstest_dump_mode(drmModeModeInfo

 enum igt_atomic_crtc_properties {
        IGT_CRTC_BACKGROUND = 0, diff --git
@@ -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


tests/kms_fbcon_fbt: When restoring fbcon always set mode to text mode

José Roberto de Souza

Patchwork

Patchwork

Souza, Jose

Shankar, Uma

Souza, Jose

Shankar, Uma

Souza, Jose

Shankar, Uma