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(|T}V@L6hHracQ<p(Ep3rHHZ9Hcp|}x!VCJ+Us|S~>6-pLF;Bva{ery><i-k3&
zR{V{63GFd1r7|C`i)?kFgvhK2Eu9b|T}xad%$IcG5VD7;b2#VxzE1lr^7)8cTPZqc
z|GBfbw~y!s-10SAB;k!tzD&!r?vMes)FZ$T9k~cXuN`p$H#pUJsL_xsp$?*hY*zTG
zc4eMwe$^QbtOgyKp2+B2Yt|>$<>57rnRt^kEBo(BbEwOC7#(Q<pg@rV0MDHv$D}hw
z0n24iI$HPvdRNG?+oe-dsT4&4((*}12VZ_WY9&SCxXZ3xkD5S*8XyzdAq(-i*3D`T
z0Z$w0NZW|Gjm1%S)&@}pF_Bh;2g#U7LrgN-(oAw1^xtH7vfs|gcb?%?roi~I_0;{h
zHjC9r$J@r~(SR|mFxAKv3bwp^QQn6unQVi;siv-iJudChdeg1+=nd)J#Fk(epHy)(
zLo1iyFpHlu1?V20WQule{^t9-nDR;%rmAa9lBFs<NOr4d%BM9sGu0=hpsFO1;FK}H
zM0}r<s^n6#yI`h#`pHHHA7pco9@nvZ)l)<-@{K{zIK<%|c1M06BeV<%;_`W)WPzAy
zJ0OVGGC>4l$-^2h`&c3KNbtWTN)ib^E>=PyR%?<11Nn(k*^m^;DIH<79j&qk7JjCg
z<YM9k9qIGIoN!t!20>JTAnHI6%^---DbNu?yzar5xSi+)?&bWctqb!Kn0Znj!)5#f
zgz*I5OcXM>-cv-_U7@?4^XQ6&^KcirC>P~|$-RXB)u9!MF!zBQUcp!Xe&(XwIA`JW
iJa&)E8}vvXrPuXmBQL&sAp`f2k8y<T_>W0PpMC+d{#(5O

delta 630
zcmZo@V4Cugae_Xpxq@GQ*+i2Y0*4A-v>5JSW;iSGqSo-mor29Wj6K<m3X@mnC^9N+
zKArQ8X>(?Q1>@xRg=sAR|Ns9#xxYwqa#K;Lr4>V|lAPgzz8gDaixxXD>|i*s*oi@Y
z1OKig%<r7us7Q1i*}&!X{;*sapZp6xhJBrdrOf-13ty}{Fj>A>J@i#y?A-HV0l{*H
z-}>$u-tLs!#Uda5!jq-gX~Vx4E-WvK7$V|cUvK!`P;{x`_xkd)!Of5BFFw}mUe8z&
zonc%Qdf0})TqxM^cE@3`Xd+m2^6X+mHW2er(d0|T>Wnid|0>q9uzlU|{2#~h7YANN
zMav%!2-<ayc?0)5r#C!`@1i0OceC66|6juPzWFfI>(7USUN|ssP=Dw2X18wP<d_l#
zMzP7YC3f7en6@xB++paJ+g&{QSc#eH=EBuICsyx(QfI)t&i6aQTvzW1c3i!Kfe9ox
zS+P`_$+&Q`U8#h%ER*g3|E0_?1)1c+0)v7(|Nh~Ve__KEZg^m41H<Rl@jI*;R_|bE
zU%f+sVf79LhSfV57OdXEuwwO&;?l_zO3fJ$PCilE%+>Sv`(Xx$66P1TCx@0TWSlhl
zds!REhWc_Xri1yLSC?lo)>{`R7N-`UC_YhK1|~r)LU10EilxQ-iVq?2k@X%eK2dzK
s*t$fZG_*9Pth{u6>8H||G88CMR+gTal$l?wkeZiLtdNmfl*(`#08$MuR{#J2

diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index ed31b12b13d4027ac023b310aae95ce1072e81bc..072f8bd2bb391db04dd7ce0a6b61051fcfb0c7a7 100644
GIT binary patch
delta 950
zcmZ{iUuaWT9LLYey}4#lX{=o*8roFoimO|1qNQ5W61GdWNzjWy3F@k#?qT3yCigb&
zCPrdsZaUrMJPg^`)7U^1f<-+`t0X3f$Yw<=Dhx|e$4{>#vzcvkv*e7MR<;)(4*Y(f
z@AsU;@6Xv89E(}L>9D$8(*C_C*I&hRC(F$iK_O18wVsRW9<Nog!gy3);}sMu6r;M!
zyGXG@>wx}-*QQuu)5vu^*!kXfy+fJ0qhFz<zh2+PRGz7g$NTDoFx4B+3wn5-Fx63m
zX<s~V)B9e+B{euqj&)@hf7>&ZiP+p38N4IG4fi{F2Z!p&6xT2!eR`LFz0>6p#q}Lx
zSBJ;ra&PEf*VXOWNW^gX6$%Zn+b?fT-@p{3LV6qz`}u;Lp5W**R7g*7Avp`&2Z?+N
z7edg4cZ5F5ZPOl83zF##EQ4cCd&X3rj$;}4IqliJ$}OnVv;V1oke<lH7CE?8%fU+K
z<@>p;ZprGF^aPjqJ+-{BV`nG_lZ?2OA2&a!z;BhFOiF2N3Q`|Bac}e&l){NcJDX`P
z1)0idG8}~V8A-~)7#qq&7E_ctaqqG({N&=;eE4zr$(gZj+T%a~5UE$&@NUwrw&3ez
zm-=_honkz1*H=)4<>Nn8D?z4KnQCLI0HdY?*T`r6ZMdDB>i2a#EynW#-Ga0)jS9P9
zRB98c!fg{Tlp6?8gf)LP5CA)|MYrQaWOvkwPm?dAPW&r56@BN;zUg@0Ui*e;>Ob)3
z^#5<e+M?#K#`AN;5p5uNpr_thmZYR#NcdkQ{V&8vGK>&;p#AWqAxXo1#&GkIvIQ%z
z(NB;J;mb9ae1Dbc+c)oE{S9D$88(7wNRqiPmkjgS*(KQSpE2EE8<NCSfu@m6eMkm)
z9?uJ=VUPGorpFd&+N5R&h%vBw+0SNX7T#1F4D^z>2i<im4QMkq-c**-Ehq<0a$vC8
zK}sS^Japd*%@!eUz)|x3;9KvOOWI9nFlshd(z39^(5{Hg%wuI7X*$SLgmZAH6k|ff
m9%D9T)lwHyxYkJqq0&VG_7dCYtz?QjPyXV5dd0Eg5B~*2t;xaw

delta 814
zcmZ{hUr19?9LMk3cCT|P>d<L9wn><1kaxOa+LWc2)x)Su%krUIf1scTg|>U03t}-f
z?@ZCoV=xGko`k}nTZzp!dI&7>B_puHq$5`fb^h6%-W!`MeCh4``+R=q_dACZ2q?xk
z!AK2WZ#vz@j#}P<*l5zInDatC;41F;gjyTU;OL=GsIn0Zj^6kLlP!zE(W*}<v8fpx
z=_cL-zqR#7b6+IC_dXVKXoZV1tCCsWP>0rq#+!pNLh$SnnJq}eetR&c7CQdI+%&uZ
z@6}J|Tx;r!c-7_zjjASG$39yXKncGqbrV$QCsnb<R7;YU8q!)rHkfM3#yWFj9SKQ~
z=Rbz`)Scx4M)My4jZSQHD>AF%KLQ$Ax4D%|(Kc?0S7hv=eYWJERc0){&n6)4U4-YD
z$GBEPK!Ur>0W!Y(I^=O7_a;R}(WKlL@#gSYWO#nc?pYQl_u_TW^0&!0ZprCH7U*Cr
z0fe1wIgsE88!yj}2V)wcl*a%)6qa^fGAqffT4o9Kdp#J_pk+ALT?yQ9rrWMC#9_X#
zxHKysj1ie<IGsEOIEUnPqGo9Goi{vN3&zxZ3q}uyMX9yb#bXhAD7+)NWOfHFz^6Vv
zcnN2GM~x5Gf-y~cn<}Ns*Y^)am*K&lc5PFVqCyU0z_Af>Y>+=_^b_{>9Jz`mDQd7o
z95midDgcws-^6J2WGc<%?jqzAGf{`!dogsfEOoj|q^Q&fFNmqJTe(2v*i7-KB1Oq8
z!N0<2-j2~ozXl8aMc@}a?5{5TvYNS=fwyDB^T-Xa_|5spMRZDRm}T<#GguTg!AE{$
z!Se(u4=kGJ+PBtGzlg@*tiQTNFLJZUDyG{^A~%g1MD8sqr|Liwcn!ByJO-jDoCwH-
bR}+xcOj(`@W0VzNWz>^+L7-k}yIt`IY)*z>

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
+ };
-- 
2.50.1