From 02cfb0b4f3049a1ce6544d7f04f76de51ad0a1cd Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 30 Nov 2004 23:41:04 +0000
Subject: [PATCH] update to current vga bios version - Cirrus VGA: support for
 1280x1024x[8,15,16] modes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1159 c046a42c-6fe2-441c-8c8c-71466251a162
---
 pc-bios/vgabios-cirrus.bin | Bin 30868 -> 32768 bytes
 pc-bios/vgabios.bin        | Bin 31533 -> 32768 bytes
 pc-bios/vgabios.diff       |  97 +++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 pc-bios/vgabios.diff

diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index 4e3c829545916e57a98d0816618dab106e9a436f..4978e42cd8edfc0ceea452dfe9c473eb75531515 100644
GIT binary patch
delta 812
zcma)2ZAep57(VCT-Ob!`H*JwR?zA-1AH|L611qN$S^aRiTA^e?1TLrB?$<Jk77J@k
ztvE*g3GHWGO6B_FYGkVmB}8RKX!!vl(zU`R!u*r2>j<(RQRm@(-{*av_izqx+YAf_
zvFjTNI%m)6Q#UpblLLPBGA-laC8=JZ)fvBJh0S#kpnINN2&5ODIEL!IMl{%9%~fDK
z){ZynLPVQB&oH;_qzNnsB%Yqg=vZmDBv$326%Cnaoi{7{?~`_^(|Z6OtOtMqx)cDw
z6R+f%^rq-Enmq2LV+P-W#V2{T`$#>JN)QBqW<KeV;L~r%s3!;%_qolhVIwfWdXNd-
zAPe%S#?PAe1D>YnXzQ@NiA7`ntTnO$#AI66_X^hvh$)mS&8DV-{%Z`6_q!SO=3|t~
z6j1M5j^BChayThE-a1Z?gsDEAty(SDv1MHg>TXoQWLqtb)wSj95oL!tknW^Mt}1UP
zHbgr4q>7ptTE9q#SoDY~fVa^kQ?zaUm*D4xl;^5ARaI?M9F^K9x{T9h-%L5vRmYTw
zVP_)2>0==U`#P&sswH?=fo48j%b<O14z!?Jc9(Gq>w&>h5TOP+)Xi?m?`6d10a5-{
z-X^<nOm^)RWoM}<18mVlCNBGMA#-00J;Ss&__$mF!m%2g5+2A;l&IFEh)<Ci<vLX9
z4A1}2R#J=|rK7z;Fe{#ri-D-EO_WJ3>{@^hk&cS;6#<>+w!){VhYO{)%+D#n&g1GR
zD&_A&geLeVtdK!<LJ{WnNw<VE@S=kgxO3c?hDb6mvVTEZGSSDq<A#>>OYeTv^l{F?
i=Lv4X7l;Uopbz-|1Pq`{XERVY{s2Ys_Wy`<_~9qA{#(5O

delta 630
zcmZo@V4Cugae_Xpxq@GQ*+i2Y0*4A-v>5JSW;iSGqSo-mor29Wj6K<m3X@mnC^9N+
zKArQ8X>(?Q1>@xRg=sARfnaifk>up2qEJgKhEgRt!vlRccE}bjc3{}SaA2_$gZu{m
zT}PPTIlWPl=s2>0%j^ANxiCKY7kmu+Itxpg_azs;Sao2se6f1ytG?K|=feVm<qW^|
z-7~!1DYuJ7KKg|xOR>|2e=l5EUKBAz#J#@W@VlYtQp4}{<!6JNAJ<=etk=Dsu_8Ld
zxG40n4S%^%u;J~F!(h=wu;}F3#fEGk=Aoj=mx|RHXHNcAtYu;Qy5adhj^i&5yo!pJ
zKO7LW>m2h2ZlDu+6yHTf9PVbf{r|s&?S1oMrq`bj2fc7$-k=VY+^t(UIi^H`QEYN;
zi5>SVrY(#OcNn_mb{9`RR$`{Qxo~yQiPbxx)EO|Z^Zkx6*VQ|M9aryQU;@caRxFif
zGA^8KS1MsG%LKHgl=-C~lU!I}P;lqpKfqA2VG1`qu(N^T^Xm8=)(oq6u(Pk;ApoQm
zfS6$c5U*IhqqubPgi>?HgOg8`Hgom-{eGCip@jLx?a85K3mGR({$ADwvZ20Qi|Jtg
z=GEm{jP=&ViN&eKCxEaFOoCX1;5;N1ON;jvA41|I>pcn-KUr*DB2XGy8dFwYy1w)i
ckVb(bWo7A!NtyY@3aNQ1#R?gzMX3y@0a6VvR{#J2

diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index ed31b12b13d4027ac023b310aae95ce1072e81bc..072f8bd2bb391db04dd7ce0a6b61051fcfb0c7a7 100644
GIT binary patch
delta 950
zcmZ`%ZAep57`|tB&b17enMsPyz@)6)mZHg&QDc2D>e48NmIZzM2nuTMIxT6j%-xw*
zoF5TIzoH-tMpE6T#cU%&Dx-`HB8fhD?G~1ny1VA-+-dYHxaXedectc)JvS$i&!;+D
zmS!^8_U$=W{s>K-OBAX!9-NPa;#*$HY)SK^!GKp<X3<bE?v)IdbP9@_r9~Dk1)IA2
zQA@?Ti?wZ$%#){?pgl|4L3lOcb2=NcobbNZAJa(g8HVus6dAVqV_K=<FPV`dJ8*kt
z-`w*xZIMQ;DZ+uJ+gbIdLak?+O#GhB?zSCztzKARFdL2KWyZ=fv)N#(s$N}LZC-<o
zZufsQqI>l|Zfp1%5)m^R9zY#-^(Yq}WX1VZ9AsTwAFvw&u@D+{K>@0B?Tl^{K8Y%Z
z6Q3at^i#rDTBJBYv6|u;Ejz0noBXH!jB6S{6mib2LKGGgi@J&JlT`GhIRbA(3r6ee
zT~Qb&*x<Rc`CSs8CTk)gPfmeTv@%^oJ@=Rp3Z&N;iqQ~6l08AU6G|s+wkY%xI*qv^
z6X_ayV0Dk&?VW-9-6J=8X`v1WFgS}ZLA!7@UxfPc4*qA+t8sr!C*_I^;yN!+C!K_!
zCcKvL8t73p@E9L%DnX_ALX)-Z3uQFo7DhNFC&?Xpl*LWMONE|o*WsX%1p742rNdh9
zcGQY@dGpbAe2o5|;0xYWOB=>$+*BIs{Tsef@t-%W7^mL;*c8@#voUI}$;waIY(cvw
zVE+}g|1y5$pc`||rN@V5o2{ck?kGHwP$AD8@c_et`$38euFq5K_Rd(4rfkstg*jlP
zP<b!+=^eCBW+0t?La{zWW!kkErt7lOSnz|Er5Nm{TCshW4J)iN0W3E!nSV`@l*S8E
zi-B6avc;6SScVdL&2!H@Y8Qoke6XcZkK;xX_+WbBnj8ne3@7oWmgQ>`ap5^+%PBJw
z7y2Mq79JXjBKs1kvEYcB&N2$EaUan%>U>1&$(v_jJZ$kW0ayI42KHd>(PH}AZ{zRm
K)&HC{wDAu^t;xaw

delta 814
zcmZ`$T}V@57(U<Tj&myN&}ligNtkGmXS!k9l%?a;#i&E;$BT0PKtUG@Z95(p#KNE4
zOwqo}KnRkq1jC?HiOn{;2rTg?Be24vPfir-)OM!l^lh&4rmOFHpXYm@_b(7ojBkM9
zYE_--cn3RTc?F^)38P}(3-usaev=bwY$~4$-Q$Ex8;QXSPB7UrF<9Y*Vw)NR-Q;WF
zx3*ku>J8`h+#y1=RyZfK88WLIY}2~XcvE+j6g)eO%;u-aK6`gmEwue1b5i74c)M;U
z`*LG%*sC^&8B{sxI`rPE0802-shf1Pzso4Hm})4>QcYQ_sd@|>YRwI`6r?<!|0ukt
z_9PDohJOPXbmUj?JFdvT#n_7R`N-+uS6-1;_w7=P|EkKgs@kQ-A>&<wr+g1oS_uIO
zZu|C7vF+y}j|;gs9F7Q@lJN-HJP{sRn6`VCg{d8Q#k2fr3YT;`kp<Fh1%R-fEyD)G
zY^*FR)*aOdB|HI`!BJ`3C9{&us%4f$Ki9B=mf=`u1#rXJPP@VogLzz0NhVGq(_=WD
zI5S8~*t-eZxHE=Ft9ZkFGr<guic(993%7ucw<K)5g%;rirw32rEO*d&7k|{Gs^ODu
zp)y?UpDDTk_ja{v8xsykh$j2#^$@*IePPfy*wc035`pP~HgUjsE1>|sEdCn7poh~b
zPVOv3PB9I2$h`wYM@y609XLuJcoDxLdNT)T=#3;lfnz)|{|qnPj=l7&u)tpke!%_y
zs)7$I>BbCL8(Khac+qdpJ1nAOV*Q*imp?&7P$RtWH|9T%Q*!^3dA@aX4fTm=49@wh
zn)PCE4q3(2H<K8gLG@zrB_${0KmvFT*E8?}BWN@pkV&s5Agg_)xhBG=EdMB@uJ{uY
J^+4N=^51MuhF<^x

diff --git a/pc-bios/vgabios.diff b/pc-bios/vgabios.diff
new file mode 100644
index 0000000000..d3a3ef7a2a
--- /dev/null
+++ b/pc-bios/vgabios.diff
@@ -0,0 +1,97 @@
+? biossums
+? vgabios.cirrus.debug.txt
+? vgabios.cirrus.txt
+? vgabios.debug.txt
+? vgabios.txt
+? tests/Makefile
+? tests/setmode.S
+? tests/setmode.c
+? tests/setmode.com
+? tests/setmode.elf
+Index: Makefile
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/Makefile,v
+retrieving revision 1.15
+diff -u -w -r1.15 Makefile
+Index: VGABIOS-lgpl-latest.bin
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/VGABIOS-lgpl-latest.bin,v
+retrieving revision 1.60
+diff -u -w -r1.60 VGABIOS-lgpl-latest.bin
+Binary files /tmp/cvsCahrMA and VGABIOS-lgpl-latest.bin differ
+Index: VGABIOS-lgpl-latest.cirrus.bin
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/VGABIOS-lgpl-latest.cirrus.bin,v
+retrieving revision 1.12
+diff -u -w -r1.12 VGABIOS-lgpl-latest.cirrus.bin
+Binary files /tmp/cvsewygNU and VGABIOS-lgpl-latest.cirrus.bin differ
+Index: VGABIOS-lgpl-latest.cirrus.debug.bin
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin,v
+retrieving revision 1.12
+diff -u -w -r1.12 VGABIOS-lgpl-latest.cirrus.debug.bin
+Binary files /tmp/cvsey9TQf and VGABIOS-lgpl-latest.cirrus.debug.bin differ
+Index: VGABIOS-lgpl-latest.debug.bin
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/VGABIOS-lgpl-latest.debug.bin,v
+retrieving revision 1.60
+diff -u -w -r1.60 VGABIOS-lgpl-latest.debug.bin
+Binary files /tmp/cvskxbTbC and VGABIOS-lgpl-latest.debug.bin differ
+Index: clext.c
+===================================================================
+RCS file: /cvsroot/vgabios/vgabios/clext.c,v
+retrieving revision 1.8
+diff -u -w -r1.8 clext.c
+--- clext.c	8 Aug 2004 16:52:55 -0000	1.8
++++ clext.c	30 Nov 2004 23:38:32 -0000
+@@ -222,7 +222,21 @@
+ 0x001a,0x221b,0x001d,
+ 0xffff
+ };
+-
++/* 1280x1024x16 */
++unsigned short cseq_1280x1024x16[] = {
++0x0300,0x2101,0x0f02,0x0003,0x0e04,0x1707,
++0x760b,0x760c,0x760d,0x760e,
++0x0412,0x0013,0x2017,
++0x341b,0x341c,0x341d,0x341e,
++0xffff
++};
++unsigned short ccrtc_1280x1024x16[] = {
++0x2911,0xc300,0x9f01,0x9f02,0x8603,0x8304,0x9405,0x2406,0xf707,
++0x6009,0x000c,0x000d,
++0x0310,0xff12,0x4013,0x4014,0xff15,0x2416,0xc317,0xff18,
++0x001a,0x321b,0x001d,
++0xffff
++};
+ 
+ cirrus_mode_t cirrus_modes[] =
+ {
+@@ -269,6 +283,12 @@
+  {0x6d,1280,1024,8,0x00,
+    cseq_1280x1024x8,cgraph_svgacolor,ccrtc_1280x1024x8,8,
+    4,0,0,0,0,0,0,0,0},
++ {0x69,1280,1024,15,0xf0,
++   cseq_1280x1024x16,cgraph_svgacolor,ccrtc_1280x1024x16,16,
++   6,5,10,5,5,5,0,1,15},
++ {0x75,1280,1024,16,0xe1,
++   cseq_1280x1024x16,cgraph_svgacolor,ccrtc_1280x1024x16,16,
++   6,5,11,6,5,5,0,0,0},
+ 
+  {0xfe,0,0,0,0,cseq_vga,cgraph_vga,ccrtc_vga,0,
+    0xff,0,0,0,0,0,0,0,0},
+@@ -310,9 +330,13 @@
+ // 1024x768x16
+   0x117, 0x74,
+ // 1024x768x24
+-//0x118, 0x79,
++  0x118, 0x79,
+ // 1280x1024x8
+   0x107, 0x6d,
++// 1280x1024x15
++  0x119, 0x69,
++// 1280x1024x16
++  0x11a, 0x75,
+ // invalid
+   0xffff,0xffff
+ };