From 9e3aaa8c60399e1a66f4700b34698ef4cc59c773 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 2 Jul 2020 16:33:09 -0400
Subject: [PATCH] vga: fix cirrus bios

RH-Author: Gerd Hoffmann <kraxel@redhat.com>
Message-id: <20200702163309.29589-2-kraxel@redhat.com>
Patchwork-id: 97895
O-Subject: [RHEL-AV-8.2.1 seabios PATCH 1/1] vga: fix cirrus bios
Bugzilla: 1847959
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Little mistake, big effect.  The patch adding the ati driver broke
cirrus due to a missing "else", which effectively downgrades cirrus
to standard vga.

Fixes: 34b6ecc16074 ("vga: add atiext driver")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit d11c75185276ded944f2ea0277532b7fee849bbc)
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
 vgasrc/vgahw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
index c774f4f2..8b64660e 100644
--- a/vgasrc/vgahw.h
+++ b/vgasrc/vgahw.h
@@ -36,7 +36,7 @@ static inline int vgahw_set_mode(struct vgamode_s *vmode_g, int flags) {
 static inline void vgahw_list_modes(u16 seg, u16 *dest, u16 *last) {
     if (CONFIG_VGA_CIRRUS)
         clext_list_modes(seg, dest, last);
-    if (CONFIG_VGA_ATI)
+    else if (CONFIG_VGA_ATI)
         ati_list_modes(seg, dest, last);
     else if (CONFIG_VGA_BOCHS)
         bochsvga_list_modes(seg, dest, last);
-- 
2.27.0