tty: vt: use VESA blanking constants

There are VESA blanking constants defined in vesa.h. So use them in the
console code instead of constant values.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-parisc@vger.kernel.org
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-34-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 13be125a06aafdc612d8b9372ece4f14d8292a35..0d5d7b5074a43a6565916326fe58a911bb63f08e 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -4320,7 +4320,7 @@ static int set_vesa_blanking(u8 __user *mode_user)
                return -EFAULT;
 
        console_lock();
-       vesa_blank_mode = (mode < 4) ? mode : 0;
+       vesa_blank_mode = (mode < 4) ? mode : VESA_NO_BLANKING;
        console_unlock();
 
        return 0;
@@ -4347,7 +4347,7 @@ void do_blank_screen(int entering_gfx)
        if (entering_gfx) {
                hide_cursor(vc);
                save_screen(vc);
-               vc->vc_sw->con_blank(vc, 1, 1);
+               vc->vc_sw->con_blank(vc, VESA_VSYNC_SUSPEND, 1);
                console_blanked = fg_console + 1;
                blank_state = blank_off;
                set_origin(vc);
@@ -4368,7 +4368,8 @@ void do_blank_screen(int entering_gfx)
 
        save_screen(vc);
        /* In case we need to reset origin, blanking hook returns 1 */
-       i = vc->vc_sw->con_blank(vc, vesa_off_interval ? 1 : (vesa_blank_mode + 1), 0);
+       i = vc->vc_sw->con_blank(vc, vesa_off_interval ? VESA_VSYNC_SUSPEND :
+                                (vesa_blank_mode + 1), 0);
        console_blanked = fg_console + 1;
        if (i)
                set_origin(vc);
@@ -4419,7 +4420,7 @@ void do_unblank_screen(int leaving_gfx)
        }
 
        console_blanked = 0;
-       if (vc->vc_sw->con_blank(vc, 0, leaving_gfx))
+       if (vc->vc_sw->con_blank(vc, VESA_NO_BLANKING, leaving_gfx))
                /* Low-level driver cannot restore -> do it ourselves */
                update_screen(vc);
        if (console_blank_hook)

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 039d1c9937d22616d3df7deae9698177fcd0c3ac..ad3a09142770e7f6989ddb1e36e9b4c73b88a832 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -480,7 +480,7 @@ static int newport_blank(struct vc_data *c, int blank, int mode_switch)
 {
        unsigned short treg;
 
-       if (blank == 0) {
+       if (blank == VESA_NO_BLANKING) {
                /* unblank console */
                treg = newport_vc2_get(npregs, VC2_IREG_CONTROL);
                newport_vc2_set(npregs, VC2_IREG_CONTROL,

diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index f3bb48a0e9801d6c25a47e3bd50d25d37ebe91ba..817b89c45e8164453065144eca5e7ca630ae62ab 100644 (file)
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -300,7 +300,7 @@ static bool sticon_switch(struct vc_data *conp)
 
 static int sticon_blank(struct vc_data *c, int blank, int mode_switch)
 {
-    if (blank == 0) {
+    if (blank == VESA_NO_BLANKING) {
        if (mode_switch)
            vga_is_gfx = 0;
        return 1;

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 804b6a180b604c1937515b3220846585f87466f2..02eccd9b3542cb0a5bc66d3b33457591885f179f 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -800,10 +800,10 @@ static void vga_pal_blank(struct vgastate *state)
 static int vgacon_blank(struct vc_data *c, int blank, int mode_switch)
 {
        switch (blank) {
-       case 0:         /* Unblank */
+       case VESA_NO_BLANKING:          /* Unblank */
                if (vga_vesa_blanked) {
                        vga_vesa_unblank(&vgastate);
-                       vga_vesa_blanked = 0;
+                       vga_vesa_blanked = VESA_NO_BLANKING;
                }
                if (vga_palette_blanked) {
                        vga_set_palette(c, color_table);
@@ -813,7 +813,7 @@ static int vgacon_blank(struct vc_data *c, int blank, int mode_switch)
                vga_is_gfx = false;
                /* Tell console.c that it has to restore the screen itself */
                return 1;
-       case 1:         /* Normal blanking */
+       case VESA_VSYNC_SUSPEND:        /* Normal blanking */
                if (!mode_switch && vga_video_type == VIDEO_TYPE_VGAC) {
                        vga_pal_blank(&vgastate);
                        vga_palette_blanked = true;