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
zcmbR8k+GqHX@Wkhp@K_l@<fvx0w)Szv>5JSW;iSGqSo-m$HL7rj6K<m43k&pC^9l^
zKArQ8X>x8p_v8zCGKz;8=QGV`ZewX?ox-NV{+%;{hk=(tfLZ9j@B$GB(f?v9lLhl6
zC#&U4N#j=Ouz7vH7o&GB0|P4q3kL%O!@>N`IZyLBSQwxn6D-5e@PR?JU~`UTfdCsT
z7b`0(10#PaSVn;1Awq_mjg@usw}MQ53C2nWcE(%=NybbDDaO*tafQV^o(!dia)t-`
zZtO5Bo_x1ZN@)i>!}}eEEW6Gzzu#fV@cyt|7@zzLK8Ah$MWxL9GK*eJ-9MSDNL}t~
zZ|vOjVFAH%hTr<`8Q$)c+r=Uu{lbH#*lEMR7tWLYi=<^lE2A?!ibD_E@Rth(8{Y0X
zeDSef_xe(>=;XE{LpBiedhz7FMe2+*CO<9Gve0<d@cbXg@fWLKMn%gX4hY(Hj(G$3
zJEu213h$yK4tKNL{{LUX_P+Tr)9cTNgI?G(Z%}{d^k%nm(PZ~x1xC@y8O3(oFPXM5
zHr!$8mb*|gd1JAe>dvCoJttQ0fKr#hyw3MK!dzGH2zFe(gMkSoH<_nIIz+Q*?ds-Z
zOt%03mwwyf&(QfkPX2J`3Dy7hFJ!=i%r6C)<iY}jf;<2I;gf%1%@l5UU}pov=hg8$
ztQl7CU}sppLx5rR4hM$SI~W$MHaxI;M|;`ini6xyLzB0ZG;{U-{eGCip_KW>oym@+
z3mGR*eq7qdq**jMyG)BIvtaY|vMk2>fReJ3s*<}UcT2j#B#1=_Z$?tNtK@RYbtFEr
w-diPiOYW5fl&X|vmKBtDmmMx+D=$EWjOCLXD}*O+WL`J<0P}nzun^--0J8pDy#N3J

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)LU<mM%B98oiVq?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
zcmZ4cjj^GDX@Wkhp@K_l@<fwkj6Wv+mS<usoh-xHsk*7+wUG^LDeH^#6|XgI*h*Pn
ze6Dz{V8dR@`a-qxwYUvODeDWb&8HZvOr2-jwI1Ma>0#({6M7x<zl`O7nOJX}Q1FX~
zcFjlFUKc||{+9`W1$Q|#AK`c%2NUE03wBR#H$TWd-L~~W35Vf<fEPBKgDq~FvIsCU
z@K1ioEV9`p?>dX9se+M#fr-9>xxSH+f}w?#vALCz<z$26VjMC%ij7kPf_9x_+`-83
ze%E=%Za0?q0lTg+?+|2ozv~KfM8Lrp%pM&_HZZ=Acp=9a6%l(lwDai>CWe3==NJQC
z2>j@L^S_K`$9cwp7c4(I-#}!Up|YR8BV?aVwk>(A7!VxPdH99Ye;bx^=7X=94!&mE
zb%nX(&IaN4QPB~HU)=vcS)p`^-@U&t&i=JMu%T2;E_jCnL*I?vI~g`GcCbgw?>M~S
z#eu)OyNZKfXn%8YIs9VJ|JDN~+&dT!^xfF!Q2cWH9tbn7_~n{Cp`A~Cd|oh27AjL`
zjGt^(rpS0|a!lD5#jBs2k8r(~*ulUU&^zzn-{Ajc|NfV8{4ZmBu^S}w;>6^_a&<=S
z$ur9x^k02$KEk%cpP{qu*Wdr!e*Fc<$iEktLBde)`uOZ%VC;1J=i~E&YcfYg7-Q|^
z_zD@uRg-HfWEjs(o>`%%7Wb+72p8BImj7jcUcCL(e1r|I`-RTuPPc!}M}ABes1TXV
zSZOOH^V`Lx%Z;tW?Q56YSA!=3FE&pOsMM~%|I5XtJMLGveB*B>#!}85SquR$iuZxV
zy4<Bf>QW#o{+Elq;DRy5UKspxaRH^5y}v-le&=E2a{C5S-T%wQ<$oF5j$I4^I~*7S
zUcC6&e1xsb?K@9`!IOX;?NHHOAW={VO#W4=B)A;J136s|95FBKChJxi@=N`Cq5jMA
zLMiVKe}=;^WG3fU$qP*WY4E?}vEikN@1I{Z|9a6fc}|s<)9;_17hZ_`0xSFfv-98!
ziC>+E4E}@o4Zj&n<ce5!Ffbl|QTwyuKU)b`!+(xaX<h|}QfAfr|6fG>+|KqQc``?}
T>g0#aTPJ^DUWNm+GI|04L#@fe

delta 814
zcmZo@U|Rc)ae_Xpxq@GQ*+i3Lj7KK^mS?(DGFgVPQ?;(*wUG^LDeH^b6|XgI*h*Pn
z?5}vOV8dR@`r>27YjGQnQq~t@n@=%TnL4N2wI1Ma>0#({6M7x<zl`O7nOJX}Q1FYj
zcFjlFUKc||{+9`W1=}2&k8r$>g9-A01;Zz|n;+y(wrxF7!eMwI;DzSqV2hikOpMHv
zA2N$=cFDWWB5I;wWME*TZ(yo#V5wkaU}bD*Wo$6nptu-^%#LE?pdE}10Xxny2E1_m
z(fQ_o8Ox6Ii~%o9e{{ZyJsjHkbO#euRvAfF94^ZYm1RYe{W&?H<niQ?(j}}y|6VZu
zoBX#_(%{SA-Cf1OFXF$sxEy}5=YQ*g67C%g2l{U8b0~iKdJlw|R{Zk8p3u&xK0Yr@
zCcBlXGftkISEk7LZ}Nn)FN&OBnvZb3me|3-7|=WK-{0W>W&i${ar`f1d-48r^AWBW
zFDEZ8S7(f$e74+yN$$&J{t8hE_Akvx*r49<@!7$^*y;Aq$LEFJWSfdGxs9Kik8td8
zVhHG-_v@dtbMOv^0|CAB{`?F6U-sw4y~!IYWEgi&K3kzDKj~BR5iYQ8EFdYx&&Y<p
zNSG{D86jl*+r_2JjjhA&YnR(sgC_wmo=<M6)J|gf?c&lM_p4jJ@i!A=Dd&zXhJY8#
z_kqR!my5jc`2}T)y@-b}yWFKgy7PazxPT(~-Y<}`-+36h+`fUtH~eyO`CrDiV;4if
z4hM#S7c!qF3s#9RzMHI8r6qX#Bh+DXI~*ALZoG(}oLFVZZ~g0q$1lqZrMx@*84ka&
zoxHG0USP{lgZ~|m4KGD}|NNru*Ndf-FH~tc$^7cP@WS*LSee4F&Vw&3e{~)*_z&VY
w{AMhXD`MHfz<Bt@yq^vK*-E$?{&SQ{^C~cuGOOPI|Dy8ecD5HSlWnS10c=i&UjP6A

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