[PATCH] vga: fix cirrus bios

[Gerd Hoffmann]

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 
---
 vgasrc/vgahw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
index c774f4f2c6b7..8b64660e5ef7 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);

[Paul Menzel]

Dear Gerd,

Am 25.06.20 um 11:17 schrieb Gerd Hoffmann:
> Little mistake, big effect.  The patch adding the ati driver broke
> cirrus due to a missing "else", which effectively downgrades cirrus
> to standard vga.

What is an easy test with QEMU to figure out, that only standard vga is 
used?
> Fixes: 34b6ecc16074 ("vga: add atiext driver")
> Signed-off-by: Gerd Hoffmann
>
> vgasrc/vgahw.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
> index c774f4f2c6b7..8b64660e5ef7 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);

Reviewed-by: Paul Menzel

Kind regards,

Paul

[Gerd Hoffmann]

On Thu, Jun 25, 2020 at 12:23:22PM +0200, Paul Menzel wrote:
> Dear Gerd,
>
> Am 25.06.20 um 11:17 schrieb Gerd Hoffmann:
> > Little mistake, big effect.  The patch adding the ati driver broke
> > cirrus due to a missing "else", which effectively downgrades cirrus
> > to standard vga.
>
> What is an easy test with QEMU to figure out, that only standard vga is
> used?

Boot some windows 10 install iso.  If it comes up with 640x480 in
grayscale you have a broken cirrus bios.

take care,
  Gerd

[Kevin O'Connor]

On Thu, Jun 25, 2020 at 11:17:09AM +0200, Gerd Hoffmann wrote:
> Little mistake, big effect.  The patch adding the ati driver broke
> cirrus due to a missing "else", which effectively downgrades cirrus
> to standard vga.

Thanks - I committed this change.

-Kevin