summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2013-01-06 03:16:07 +0100
committercinap_lenrek <cinap_lenrek@gmx.de>2013-01-06 03:16:07 +0100
commita5b6143c4c73098bfabe8b58f7e922473387a17d (patch)
treed9ab48f159a1f84be045bf5dcee7ec4421a1f134 /sys
parent0d5c57a1325410fd6f1362facc45802afb953be3 (diff)
vga: avoid setting vgactl type vesa multiple times
Diffstat (limited to 'sys')
-rw-r--r--sys/src/cmd/aux/vga/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/src/cmd/aux/vga/main.c b/sys/src/cmd/aux/vga/main.c
index 2d3c6a3e7..a42e8e648 100644
--- a/sys/src/cmd/aux/vga/main.c
+++ b/sys/src/cmd/aux/vga/main.c
@@ -390,7 +390,6 @@ main(int argc, char** argv)
}
else
vtype = vga->ctlr->name;
- vgactlw("type", vtype);
/*
* VESA must be set up before linear.
@@ -401,7 +400,8 @@ main(int argc, char** argv)
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 @@ main(int argc, char** argv)
* 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",