git: 9front

Info  •  Files  •  Log  •  Branches

vga: avoid setting vgactl type vesa multiple times

--- a/sys/src/cmd/aux/vga/main.c

+++ b/sys/src/cmd/aux/vga/main.c

@@ -390,7 +390,6 @@

 			}

 			else

 				vtype = vga->ctlr->name;

-			vgactlw("type", vtype);

 			/*

 			 * VESA must be set up before linear.

@@ -401,7 +400,8 @@

 				if(vga->vesa->flag&Ferror)

 					error("vesa load error\n");

 				vgactlw("type", vesa.name);

-			}

+			} else

+				vgactlw("type", vtype);

 			/*

 			 * The new draw device needs linear mode set

@@ -413,7 +413,7 @@

 			 * Linear is over so switch to other driver for

 			 * acceleration.

 			 */

-			if(vga->vesa)

+			if(vga->vesa && strcmp(vesa.name, vtype))

 				vgactlw("type", vtype);

 			sprint(buf, "%ludx%ludx%d %s",

-- 

⑨