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
zc-oDST}V@57{{OYoSn_wYD-(Bj!jE5y(msZA6Pl9$m+u7YK4*o5xAUgJ0Dv{(PCkZ
zsTHqLH=$j|p;YF@(a2T@N{Gse(DDO9q+^9kgn5&$;}EI~!S~Pq{Xaav2i}*bbs7Z%
z#H}q9oxT6u+1uNO4E<jD8ZDCW#vos&<!Nukgqms*;D@dp1d-RSIDzZjT0Bs1%8^hT
z(MC3^f>f(IS2Mffj1E?UflN!Jx394p6Kiwv>iP`4(VdyK^rSV?;XaIx)B#YSN&$f9
z?ucu`ouY!p<4h7g`~ssV;@aggsHs$nq5$dnBr(9(zeKC1C>-}V_3KarXiyzwASYxZ
z9#?x=-67y<GaYRi61TE=)SJ0p)Idz6RlRRXB_Jl59jh$zD(Jh(@MNEpk?%aisZ754
zQ}e0&?;JL}nU1%N(ZeBgugX#-m#Ns&&UtwsE@!e##)hhzGWNK%TklV^)5ABU_v4$x
z9elEj8yQ-?P!6*ADU*-x;R&X2=cez0Z}TayWMQ(h$|Bh+luvYOr%He7vZpFfN@2~O
zM1oVtf)ep#MyimD$<BNQKH0$FgKRc3;u?0Zc9Q5ufe{Fs2RPitZqMssgr<H$T#OIN
z2*pIl0YS8v2qF**4C}b8V+G73A^4I|-r(b6IfP=>7Ae%9mnfD^$tF2zAk2=V7532F
zZ)GJ##0fgu6Mz}vv{(d!vNl09D7Gqwc7cux;&mUs#O**Ya5ooBZJwKzz{->I2rl6t
zAdJWPMxubhwZ1~a>51I+okv$}oR7Q6jVcN!@8u}+Pu<IX<OY|R`=WS^v+=n;r_bXL
c`y`**@A+TIkFQ=x$6e%O93|V9;WYI553>GSy#N3J

delta 630
zc-m`dV4Cugae_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|<`F=;3>*^iBj;nVtFoEPIE0#(#
z85d5rE0wU8Wdhn#%KTE0NiHlfD7f?QA7H51Fohc)*xA7Fd3F2_YlhW3*x6U_5CGB&
zK+LcJh*zxMQCvECLa909!O15|o4I=aem~6MP{RD;_T<pAg^ZIXe=lnT*-&4u#dI)#
z^Xl>}#(L}G#NyQA6F^u7CW(Rbkl0I$_Z1()q3$RUpDea65hx8UjVUWHU0?bMNTWcJ
Yva<BVq|E$ch19&1Vug&<qEv>{08$MuR{#J2

diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index ed31b12b13d4027ac023b310aae95ce1072e81bc..072f8bd2bb391db04dd7ce0a6b61051fcfb0c7a7 100644
GIT binary patch
delta 950
zc-nPRZAep57`|tBuC)x8nMI1uz@)6)W@5>dQDc1|b!iksO9QJPK|#%3rxh)xwLAOd
z{D>&}6$Mc+lJYh!W*ZSvDrIC4N%X;6w=gw7cGo<eI~VmQxaab`&-=U|=Y7xZ3FP&v
z&X=T_47R-u7gj$;Qy1d-DvcZGBBAh(M>1Q|+-cC~k(OCB6pVQ!gJl*4h0W4Ji<W}T
z9Zyk9+4{>>ZQ+d8(@emgDeWY@n(*0Y>M|YhzRDNXNUj-%@cJYfvihQ0sqPP%o+R7x
zsq&sV7c1MsjapNf151Zv&6_f{o@Fxddp4`XcJQ@&L7Bm9G_Ec&mY0~#2Gg2~(((%P
zT5NQ={^Jo{rF*$;p<W~+W;oP`+U@FLE;PW3^Qbw%I=LQTH~OPNH0*>tRO8$g*)Dt%
zRSYNgA`bLZ!Z+Ha*hjIN;u$ZS@{Uga^?t^cjUNg)$2K7Xi-|?u#P&!k`q3Kxx54?t
zHMPzN3=wQ_U)%C70nZba;h;M^&mmfwvx8mtnIQ7ds?8T8K?o<h0xky>PuOe`=q7X;
zb3`V5cJQIq^`*0W2JUlxxz$ZusjdbFXYxg;9#`-M=qcXG|15Yl=8Nj2MIwW^Ggqe*
z4#H0pUQ2ilbSWNqf)6znp<;Zg$y)N2G8%C!Bb<~I<Q_fBMyBDVLZ_}<T}?9y_Gwy6
zhqay^=oqf|<f5DSDE&XfmprSM){WA<$uczh7knT6HyT!q(P&?E3hO;t7&TXB=EiNd
zfL-Iaj|c4I#*Z9yV6M6N_>gR~wb#k*`6uEk<en|=XE<;@Omcw@If`!2jDj>}f$k5?
z1|x;adwC!$X(!W>&OV{2&rzG+S`5*3S!pg9p=~LG-P9|dO0l7l)C92Hyky>ukyPt>
z$;ChwUfE*GSS&-4ytdyxm+B&rix0Hq>v7CT{2xp&oReeVlc5z~X<5E59uxW@OHRs2
zOz43{vhc`A6x$m|jd_RFbe0h~7V{EKqs~jT?wq*>#?2NE5pc#jHPC>yM+)g{zl(pc
K*Z*_U(5Bx*t;xaw

delta 814
zc-nQ5T}V@57{|}MFXvR$q0@3~lQ7XB&ve7IDNDzxi&2NxhZp7gfPyX*+IBoHh=m_{
zW{UP+211Z@B@_moN^G{#MPP|H8G#iRy>g;Zr?xXar+0IOH{Jc7|Nnjd@AE!yD5RL!
z03$W(ddu-nX4Li?#72{5#k?OH0atO86>1&ofEwLng(`;z!%J4MII=LTutJGLi@`AY
z1_bS`SDX7H`Mr0DFr^pH$&5;73`6aD51MH1iD?Aijv_M!X|dng6VnRqf5qIicoyES
zpUJu0)EDt<tq~ekO?nP}uq%KPeo-1GT^;XL#WqVVN!n^idkxuuv9ZqDSVuzA=lhSt
z`|3{efS~!efJR4tb3gEn{5#Bc%;%%0xo^B8<L=w#mi%*-8CSi_O+ebe1WyGXsPz&8
z65I~#A>-RG!afi3Zn#`gG$rFF<nTmfcwyS<TNb8v@QQEw^ArwsyO9l2OeKJ@gDJ-W
zBTT$JJKhu138g#%=%F!b+aoiQ%xGmsgMO`H2Q9<#u1esAvt3SwDGu}5;?gYKqR9;E
zcH>Ttl5lo2bg*Ykk5}=A`4)m6922G1Ru3Kl2X9F@cndAUN30P%gR|^G^Id#Um%dGv
zvdY(XhoTE`Z+Dx%Dd}>BDa`=29;VjGuQd7&d%F)@BCtHzE)JS+B^4l$&0iyE^l&<@
z$z4UrEoRVwygL{^T9)eW#8v8p7sXWUW-icC8!7z}uJMcc=XmK(oMl{vg~1~56YdXI
z7k*sH3}(XK@B;F}i$QDtVG$h@8|DIe{0Sn8n&ADQx!_5Hln0iq^KF}Js9!|ma4uNg
zVidVKWEa!NEFw398bt0DDW~dC68KHmRd|6>G?oa-8ow?iYXfC@79yam_#~t5#8VCG
Jg^n8)e*kPwhF<^x

diff --git a/pc-bios/vgabios.diff b/pc-bios/vgabios.diff
new file mode 100644
index 00000000000..d3a3ef7a2ab
--- /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
+ };
-- 
2.39.5