11e423a8fSmrgcommit 37bf1be0fbaed7578f91485a00d37db3f1c84fe3
21e423a8fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
31e423a8fSmrgDate:   Sun Jul 10 17:11:22 2022 -0700
41e423a8fSmrg
51e423a8fSmrg    xf86-video-mga 2.0.1
61e423a8fSmrg    
71e423a8fSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
81e423a8fSmrg
91e423a8fSmrgcommit 638653561df767b052e372821ffd51c457591202
101e423a8fSmrgAuthor: Raphael Isemann <teemperor@gmail.com>
111e423a8fSmrgDate:   Wed Apr 13 12:14:46 2022 +0200
121e423a8fSmrg
131e423a8fSmrg    Fix uninitialized read in MGAEnableSecondOutPut
141e423a8fSmrg    
151e423a8fSmrg    `MGAGRestore` allocated `ModeInfo` without initializing its memory and then
161e423a8fSmrg    passes it into `MGAEnableSecondOutPut` via `MGAEnableSecondOutPut(pScrn, &ModeInfo);`.
171e423a8fSmrg    
181e423a8fSmrg    `MGAEnableSecondOutPut` then reads the unitialized memory in the line
191e423a8fSmrg    `if ( !(pModeInfo->flSignalMode & POS_HSYNC) )`.
201e423a8fSmrg    
211e423a8fSmrg    This patch just zeroes the memory to prevent those branches to be randomly
221e423a8fSmrg    taken.
231e423a8fSmrg    
241e423a8fSmrg    Signed-off-by: Raphael Isemann <teemperor@gmail.com>
251e423a8fSmrg
261e423a8fSmrgcommit a6ab1e08ee8c5a6dfaebe8fc331bd0811ab8d13f
271e423a8fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
281e423a8fSmrgDate:   Sat Jan 22 13:06:47 2022 -0800
291e423a8fSmrg
301e423a8fSmrg    gitlab CI: add a basic build test
311e423a8fSmrg    
321e423a8fSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
331e423a8fSmrg
341e423a8fSmrgcommit 1e4dbef654bd31f5706b4b860f6b34c7e5e5f440
351e423a8fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
361e423a8fSmrgDate:   Sat Jan 22 13:05:35 2022 -0800
371e423a8fSmrg
381e423a8fSmrg    Fix spelling/wording issues
391e423a8fSmrg    
401e423a8fSmrg    Found by using:
411e423a8fSmrg        codespell --builtin clear,rare,usage,informal,code,names
421e423a8fSmrg    
431e423a8fSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
441e423a8fSmrg
451e423a8fSmrgcommit f74f0504156f2504294cdd9c7f068ab4745a5c4e
461e423a8fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
471e423a8fSmrgDate:   Sat Jan 22 12:57:58 2022 -0800
481e423a8fSmrg
491e423a8fSmrg    Build xz tarballs instead of bzip2
501e423a8fSmrg    
511e423a8fSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
521e423a8fSmrg
531e423a8fSmrgcommit f227f2f286123a9ca64b567783825a2c18b87971
541e423a8fSmrgAuthor: Fabrice Fontaine <fontaine.fabrice@gmail.com>
551e423a8fSmrgDate:   Sat May 4 20:43:26 2019 +0200
561e423a8fSmrg
571e423a8fSmrg    configure.ac: fix cross-compilation
581e423a8fSmrg    
591e423a8fSmrg    AC_CHECK_FILE can't be used when cross-compiling
601e423a8fSmrg    
611e423a8fSmrg    [Retrieved from:
621e423a8fSmrg    https://git.buildroot.net/buildroot/tree/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch]
631e423a8fSmrg    Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
641e423a8fSmrg
65b0de6900Smrgcommit 924c310dfecbfb916f0e81c03f1142a401bed056
66b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
67b0de6900SmrgDate:   Fri Dec 7 16:43:46 2018 -0800
68b0de6900Smrg
69b0de6900Smrg    Version bumped to Version 2.0.0
70b0de6900Smrg    
71b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
72b0de6900Smrg
73b0de6900Smrgcommit ada903eea2e138643faa721f37737ed885363bf7
74b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
75b0de6900SmrgDate:   Fri Dec 7 16:21:44 2018 -0800
76b0de6900Smrg
77b0de6900Smrg    Version bumped to Version 1.6.901
78b0de6900Smrg    
79b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
80b0de6900Smrg
81b0de6900Smrgcommit 54f0f0723d4291a23a2f1c10fcf33560f9a4340a
82b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
83b0de6900SmrgDate:   Thu Dec 6 20:49:31 2018 -0800
84b0de6900Smrg
85b0de6900Smrg    Remove last remnants of old Matrox HAL
86b0de6900Smrg    
87b0de6900Smrg    Apparently, commit 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1
88b0de6900Smrg    missed removing a few more files related to old Matrox HAL.
89b0de6900Smrg    
90b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
91b0de6900Smrg    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
92b0de6900Smrg
93b0de6900Smrgcommit b293b0956d518b2cc3833d0d2d846301fe35c0a0
94b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
95b0de6900SmrgDate:   Thu Nov 29 10:41:23 2018 -0800
96b0de6900Smrg
97b0de6900Smrg    Version bumped to Version 1.6.900
98b0de6900Smrg    
99b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
100b0de6900Smrg
101b0de6900Smrgcommit c5d295f06c83ba69811c17880e033cbd0fdb52b1
102b0de6900SmrgAuthor: Henry Zhao <henry.zhao@oracle.com>
103b0de6900SmrgDate:   Mon Nov 26 13:15:24 2018 -0800
104b0de6900Smrg
105b0de6900Smrg    Write 8 bits instead of 32 to MGAREG_CACHEFLUSH
106b0de6900Smrg    
107b0de6900Smrg    Fixes misaligned address crash when EXA is enabled on Solaris SPARC
108b0de6900Smrg    (Oracle Bug id 22993744)
109b0de6900Smrg    
110b0de6900Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
111b0de6900Smrg
112b0de6900Smrgcommit 11abbd45e0c93b672a7e8d5730560a6b351c7a9b
113b0de6900SmrgAuthor: Matthieu Herrb <matthieu@herrb.eu>
114b0de6900SmrgDate:   Mon Nov 26 21:12:05 2018 +0100
115b0de6900Smrg
116b0de6900Smrg    Use fabs() to compute absolute value of floating point number.
117b0de6900Smrg    
118b0de6900Smrg    Fixes a warning from clang and looks like it was a real bug.
119b0de6900Smrg    
120b0de6900Smrg    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
121b0de6900Smrg    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
122b0de6900Smrg
123b0de6900Smrgcommit 4ce40b932cdced590af1c32f6f491f63e9a247dd
124b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
125b0de6900SmrgDate:   Mon Nov 26 11:03:39 2018 -0800
126b0de6900Smrg
127b0de6900Smrg    Suppression of a compilation error when XAA is not in use
128b0de6900Smrg    
129b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
130b0de6900Smrg
131b0de6900Smrgcommit 4017c6e91f8938f1f1617e53e30ee1d3d10d490c
132b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
133b0de6900SmrgDate:   Mon Nov 26 11:02:30 2018 -0800
134b0de6900Smrg
135b0de6900Smrg    Convert most HAVE_XAA_H conditional compilation labels to USE_XAA
136b0de6900Smrg    
137b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
138b0de6900Smrg
139b0de6900Smrgcommit c5922dcc3ff26c9b1291e90ecedee35f97bc51c8
140b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
141b0de6900SmrgDate:   Mon Nov 26 11:01:33 2018 -0800
142b0de6900Smrg
143b0de6900Smrg    Eliminate set but unused variables
144b0de6900Smrg    
145b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
146b0de6900Smrg
147b0de6900Smrgcommit 8db8f6b3f323a9d9cd934172c9f4d4a93a6b7394
148b0de6900SmrgAuthor: Kevin Brace <kevinbrace@gmx.com>
149b0de6900SmrgDate:   Mon Nov 26 11:00:32 2018 -0800
150b0de6900Smrg
151b0de6900Smrg    Eliminate unused variables
152b0de6900Smrg    
153b0de6900Smrg    Care had to be taken to properly handle XAA usage situation
154b0de6900Smrg    
155b0de6900Smrg    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
156b0de6900Smrg
157b0de6900Smrgcommit 94c70f888b3e3b1e4c9f324f188279f276c9cbbd
158b0de6900SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
159b0de6900SmrgDate:   Sun Nov 25 14:31:30 2018 -0800
160b0de6900Smrg
161b0de6900Smrg    Update configure.ac bug URL for gitlab migration
162b0de6900Smrg    
163b0de6900Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
164b0de6900Smrg
165b0de6900Smrgcommit a939aa56b3af4418d0c026a3775fde7288b0cca7
166b0de6900SmrgAuthor: Mikulas Patocka <mikulas@twibright.com>
167b0de6900SmrgDate:   Tue Nov 20 08:41:14 2018 -0800
168b0de6900Smrg
169b0de6900Smrg    mga_drv: fix image corruption due to memcpy reordering
170b0de6900Smrg    
171b0de6900Smrg    The memcpy specification doesn't specify how the destination is written -
172b0de6900Smrg    and on glibc 2.19 memcpy is doing some bytewise writes with the rep stosb
173b0de6900Smrg    instruction. These bytewise writes confuse the hardware (because it
174b0de6900Smrg    expects 32-bit writes) and result in image corruption.
175b0de6900Smrg    
176b0de6900Smrg    This patch replaces memcpy with explicit writes, so that the sequential
177b0de6900Smrg    write order and 32-bit write size is guaranteed. We use the "volatile"
178b0de6900Smrg    attribute to make sure that compiler optimizations won't cause write
179b0de6900Smrg    reordering. When reading the memory, we use a structure with "packed"
180b0de6900Smrg    attribute to avoid unaligned traps on RISC machines.
181b0de6900Smrg    
182b0de6900Smrg    Tested-by: Kevin Brace <kevinbrace@gmx.com>
183b0de6900Smrg    Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
184b0de6900Smrg
185b0de6900Smrgcommit 0f4883f0b8ebfd105d5cee93841bc69f0f2b60b7
186b0de6900SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
187b0de6900SmrgDate:   Sun Nov 18 13:25:33 2018 -0800
188b0de6900Smrg
189b0de6900Smrg    Update README for gitlab migration
190b0de6900Smrg    
191b0de6900Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
192b0de6900Smrg
193b0de6900Smrgcommit 34f37fe119f07e1e7b79964de08ac601a0753a7f
194b0de6900SmrgAuthor: Nicolas Kaiser <nikai@nikai.net>
195b0de6900SmrgDate:   Sun May 29 11:36:11 2011 +0200
196b0de6900Smrg
197b0de6900Smrg    fix typo in MGADRIMoveBuffersXAA()
198b0de6900Smrg    
199b0de6900Smrg    Fix typo in MGADRIMoveBuffersXAA().
200b0de6900Smrg    
201b0de6900Smrg    Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
202b0de6900Smrg    Reviewed-by: Cyril Brulebois <kibi@debian.org>
203b0de6900Smrg
204b0de6900Smrgcommit 31544d805f99da54d5d3c658ccc137813dbde52b
205b0de6900SmrgAuthor: Mikulas Patocka <mikulas@twibright.com>
206b0de6900SmrgDate:   Tue Feb 13 01:43:13 2018 +0100
207b0de6900Smrg
208b0de6900Smrg    mga_drv: use exa by default
209b0de6900Smrg    
210b0de6900Smrg    If the Xserver doesn't support XAA, we must turn EXA on by default -
211b0de6900Smrg    otherwise we end up with no acceleration at all.
212b0de6900Smrg    
213b0de6900Smrg    Reviewed-by: Matt Turner <mattst88@gmail.com>
214b0de6900Smrg    Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
215b0de6900Smrg
216b0de6900Smrgcommit 97c801e49251ffedf0eebd0563c737318433f114
217b0de6900SmrgAuthor: Mikulas Patocka <mikulas@twibright.com>
218b0de6900SmrgDate:   Tue Feb 13 01:42:41 2018 +0100
219b0de6900Smrg
220b0de6900Smrg    mga_drv: fix warning
221b0de6900Smrg    
222b0de6900Smrg    Fix warnings in the MGA driver. There's no functional change.
223b0de6900Smrg    
224b0de6900Smrg    Reviewed-by: Matt Turner <mattst88@gmail.com>
225b0de6900Smrg    Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
226b0de6900Smrg
227b0de6900Smrgcommit 767c19e7142da1060586b1ff2b5e7253b6d6276b
228b0de6900SmrgAuthor: Mikulas Patocka <mikulas@twibright.com>
229b0de6900SmrgDate:   Tue Feb 13 01:42:27 2018 +0100
230b0de6900Smrg
231b0de6900Smrg    mga_drv: fix structure definition
232b0de6900Smrg    
233b0de6900Smrg    Fix missing entry in structure definition.
234b0de6900Smrg    
235b0de6900Smrg    Reviewed-by: Matt Turner <mattst88@gmail.com>
236b0de6900Smrg    Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
237b0de6900Smrg
238b0de6900Smrgcommit b9aab0dcb171ab936a8581d8287aac3a90652a09
239b0de6900SmrgAuthor: Mikulas Patocka <mikulas@twibright.com>
240b0de6900SmrgDate:   Tue Feb 13 01:42:08 2018 +0100
241b0de6900Smrg
242b0de6900Smrg    mga_drv: fix a typo
243b0de6900Smrg    
244b0de6900Smrg    Fix a typo that causes dynamic symbol lookup failure and xserver crash.
245b0de6900Smrg    
246b0de6900Smrg    Reviewed-by: Matt Turner <mattst88@gmail.com>
247b0de6900Smrg    Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
248b0de6900Smrg
249b0de6900Smrgcommit 2998868964b2f3a56b6759fd8dc4462d812dbe1a
250b0de6900SmrgAuthor: Emil Velikov <emil.velikov@collabora.com>
251b0de6900SmrgDate:   Mon Jul 17 11:05:57 2017 +0100
252b0de6900Smrg
253b0de6900Smrg    xf86-video-mga: remove the GlxSetVisualConfigs stub and friends
254b0de6900Smrg    
255b0de6900Smrg    The function was an empty since 2008 at least. Remove it alongside the
256b0de6900Smrg    unused GLX visuals code.
257b0de6900Smrg    
258b0de6900Smrg    With this all the GL/GLX dependencies in the driver are gone.
259b0de6900Smrg    
260b0de6900Smrg    Cc: Mathieu Larouche <mathieu.larouche@matrox.com>
261b0de6900Smrg    Cc: Dave Airlie <airlied@redhat.com>
262b0de6900Smrg    Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
263b0de6900Smrg    ---
264b0de6900Smrg    There's a GLX reference in mga_ucode.h - a file which was seemingly
265b0de6900Smrg    never used since day 1. I'm not going to bother with that, since I've
266b0de6900Smrg    taken enough of a diversion already ;-)
267b0de6900Smrg
268b0de6900Smrgcommit 42fabf69c33d0e803eb661cc06217611bc3c9048
269b0de6900SmrgAuthor: Mathieu Larouche <mathieu.larouche@matrox.com>
270b0de6900SmrgDate:   Tue Jun 13 13:43:45 2017 -0400
271b0de6900Smrg
272b0de6900Smrg    xf86-video-mga: Fix to always set HiPri for G200e4 V2
273b0de6900Smrg    
274b0de6900Smrg      - Changed the HiPri value for G200e4 to always be 0.
275b0de6900Smrg      - Added Bandwith limitation to block resolution above 1920x1200x60Hz
276b0de6900Smrg    
277b0de6900Smrg      - (V2): Pulled out ulMemoryBandwidth of condition so it's always initialized
278b0de6900Smrg            as reviewed by : Stefan Dirsch <sndirsch@suse.de>
279b0de6900Smrg    
280b0de6900Smrg    Reviewed-by: Samer El-Haj-Mahmoud <smahmoud@lenovo.com>
281b0de6900Smrg
282b0de6900Smrgcommit e55abc95c2b7f7cb8de73e1e21688fb5b5c08d5c
283b0de6900SmrgAuthor: Mathieu Larouche <mathieu.larouche@matrox.com>
284b0de6900SmrgDate:   Tue Feb 7 11:12:14 2017 -0500
285b0de6900Smrg
286b0de6900Smrg    xf86-video-mga: Add support for a new G200eH3 device
287b0de6900Smrg    
288b0de6900Smrg    - Added support for the new deviceID for G200eH3
289b0de6900Smrg    - Added PLL algorithm for the G200eH3
290b0de6900Smrg    - Removed the bandwidth limitation for the G200eH3
291b0de6900Smrg    
292b0de6900Smrg    Signed-off-by: Mathieu Larouche <mathieu.larouche@matrox.com>
293b0de6900Smrg    Reviewed-by: Dave Airlie <airlied@redhat.com>
294b0de6900Smrg
295b0de6900Smrgcommit 2ccc50072ccb70411e5e32644e74ef7c6b33f628
296b0de6900SmrgAuthor: Mihail Konev <k.mvc@ya.ru>
297b0de6900SmrgDate:   Thu Jan 26 14:00:22 2017 +1000
298b0de6900Smrg
299b0de6900Smrg    autogen: add default patch prefix
300b0de6900Smrg    
301b0de6900Smrg    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
302b0de6900Smrg
303b0de6900Smrgcommit b9f57d1717fe9035d354b47e877ae110546d6f28
304b0de6900SmrgAuthor: Emil Velikov <emil.l.velikov@gmail.com>
305b0de6900SmrgDate:   Mon Mar 9 12:00:52 2015 +0000
306b0de6900Smrg
307b0de6900Smrg    autogen.sh: use quoted string variables
308b0de6900Smrg    
309b0de6900Smrg    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
310b0de6900Smrg    fall-outs, when they contain space.
311b0de6900Smrg    
312b0de6900Smrg    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
313b0de6900Smrg    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
314b0de6900Smrg    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
315b0de6900Smrg
316b0de6900Smrgcommit 0b8e81d2a435e190e1a1b81e776423d255b4cb9a
317b0de6900SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net>
318b0de6900SmrgDate:   Tue Jan 24 10:32:07 2017 +1000
319b0de6900Smrg
320b0de6900Smrg    autogen.sh: use exec instead of waiting for configure to finish
321b0de6900Smrg    
322b0de6900Smrg    Syncs the invocation of configure with the one from the server.
323b0de6900Smrg    
324b0de6900Smrg    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
325b0de6900Smrg    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
326b0de6900Smrg
327b0de6900Smrgcommit 7407e79cd62f7209a5fe0265882d0ee3d0007196
328b0de6900SmrgAuthor: Colin Walters <walters@verbum.org>
329b0de6900SmrgDate:   Wed Jan 4 17:37:06 2012 -0500
330b0de6900Smrg
331b0de6900Smrg    autogen.sh: Implement GNOME Build API
332b0de6900Smrg    
333b0de6900Smrg    http://people.gnome.org/~walters/docs/build-api.txt
334b0de6900Smrg    
335b0de6900Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
336b0de6900Smrg
337b0de6900Smrgcommit 9ae2ad4ee9b0a9ad64fec0f88b68886d7b0b8663
338b0de6900SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net>
339b0de6900SmrgDate:   Thu Jan 26 11:18:06 2017 +1000
340b0de6900Smrg
341b0de6900Smrg    configure: Drop AM_MAINTAINER_MODE
342b0de6900Smrg    
343b0de6900Smrg    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
344b0de6900Smrg
345ee82cb62Smrgcommit 979e0e73eb3424b6a97746e29c8b4a5b7e86196e
346ee82cb62SmrgAuthor: Matt Turner <mattst88@gmail.com>
347ee82cb62SmrgDate:   Tue Jan 17 14:40:48 2017 -0800
348ee82cb62Smrg
349ee82cb62Smrg    xf86-video-mga 1.6.5
350ee82cb62Smrg    
351ee82cb62Smrg    Signed-off-by: Matt Turner <mattst88@gmail.com>
352ee82cb62Smrg
353ee82cb62Smrgcommit fc5d7acc23fcec9d87ca26fadf466fcf107671c0
354ee82cb62SmrgAuthor: Mathieu Larouche <mathieu.larouche@matrox.com>
355ee82cb62SmrgDate:   Wed Jul 20 09:18:49 2016 -0400
356ee82cb62Smrg
357ee82cb62Smrg    xf86-video-mga: Add support for the new G200e chipset -- V2
358ee82cb62Smrg    
359ee82cb62Smrg    - Added PLL algorithm for a new rev of G200e
360ee82cb62Smrg    - Removed the bandwidth limitation for the new G200e
361ee82cb62Smrg    
362ee82cb62Smrg    Fixes : https://bugs.freedesktop.org/show_bug.cgi?id=92540
363ee82cb62Smrg    
364ee82cb62Smrg    Change from V1 :
365ee82cb62Smrg    - Make sure we don't cause issue on previous chips. (Dave Airlie review)
366ee82cb62Smrg    
367ee82cb62Smrg    Signed-off-by: Mathieu Larouche <mathieu.larouche@matrox.com>
368ee82cb62Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
369ee82cb62Smrg
370ee82cb62Smrgcommit 12781f2e3deb7f6d86fde53134384996a6004894
371ee82cb62SmrgAuthor: Mathieu Larouche <mathieu.larouche@matrox.com>
372ee82cb62SmrgDate:   Fri Jun 17 10:52:42 2016 -0400
373ee82cb62Smrg
374ee82cb62Smrg    xf86-video-mga: Add support for a new G200eW3 chipset
375ee82cb62Smrg    
376ee82cb62Smrg    - Added support for the new deviceID for G200eW3
377ee82cb62Smrg    - Added PLL algorithm for the G200eW3
378ee82cb62Smrg    - Added some initialization code for G200eW3
379ee82cb62Smrg    
380ee82cb62Smrg    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=92541
381ee82cb62Smrg    
382ee82cb62Smrg    Signed-off-by: Mathieu Larouche <mathieu.larouche@matrox.com>
383ee82cb62Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
384ee82cb62Smrg
385ee82cb62Smrgcommit df094bfffe4ef097bfd9a569f2d2e35649c1a3c7
386ee82cb62SmrgAuthor: Adam Jackson <ajax@redhat.com>
387ee82cb62SmrgDate:   Tue Jul 19 10:03:56 2016 -0400
388ee82cb62Smrg
389ee82cb62Smrg    Adapt Block/WakeupHandler signature for ABI 23
390ee82cb62Smrg    
391ee82cb62Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
392ee82cb62Smrg
393ee82cb62Smrgcommit 72a8b5ef0bcb08d4cde7b329a13a59db35342f58
394ee82cb62SmrgAuthor: Thomas Klausner <wiz@NetBSD.org>
395ee82cb62SmrgDate:   Mon Feb 23 13:26:14 2015 +0100
396ee82cb62Smrg
397ee82cb62Smrg    Use correct type in function call.
398ee82cb62Smrg    
399ee82cb62Smrg    Fixes
400ee82cb62Smrg    passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type
401ee82cb62Smrg    pciaccess.h:153:5: note: expected '__uint32_t *' but argument is of type 'CARD32 *'
402ee82cb62Smrg    
403ee82cb62Smrg    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
404ee82cb62Smrg    Reviewed-by: Connor Behan <connor.behan@gmail.com>
405ee82cb62Smrg
406ee82cb62Smrgcommit f1e6c73be073c8816319104b2fde329bc286f5ec
407ee82cb62SmrgAuthor: Connor Behan <connor.behan@gmail.com>
408ee82cb62SmrgDate:   Mon Aug 24 13:48:29 2015 -0400
409ee82cb62Smrg
410ee82cb62Smrg    Composite fixup
411ee82cb62Smrg    
412ee82cb62Smrg    A driver like this that tries to composite a lot will definitely need to
413ee82cb62Smrg    avoid crashing for solid pictures.
414ee82cb62Smrg    
415ee82cb62Smrg    Signed-off-by: Connor Behan <connor.behan@gmail.com>
416ee82cb62Smrg
417ee82cb62Smrgcommit e6770f7cc11800ab6cc2e88790f357189de7ce32
418ee82cb62SmrgAuthor: Connor Behan <connor.behan@gmail.com>
419ee82cb62SmrgDate:   Mon Aug 24 11:48:16 2015 -0400
420ee82cb62Smrg
421ee82cb62Smrg    Remove DownloadFromScreen
422ee82cb62Smrg    
423ee82cb62Smrg    This hook was broken and did the same thing as a software fallback.
424ee82cb62Smrg    
425ee82cb62Smrg    Signed-off-by: Connor Behan <connor.behan@gmail.com>
426ee82cb62Smrg
427ee82cb62Smrgcommit 04432b9c1db255e8e3d39a924f8803f83c407acc
428ee82cb62SmrgAuthor: Adam Jackson <ajax@redhat.com>
429ee82cb62SmrgDate:   Tue May 5 11:05:44 2015 -0400
430ee82cb62Smrg
431ee82cb62Smrg    Enable write-combining on the framebuffer BAR
432ee82cb62Smrg    
433ee82cb62Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
434ee82cb62Smrg
435ee82cb62Smrgcommit da1223394ac9b6f3974b0b2570cbf46a2425fc11
436ee82cb62SmrgAuthor: Matthew Rezny <matthew@reztek.cz>
437ee82cb62SmrgDate:   Sun Jun 21 19:50:43 2015 +0200
438ee82cb62Smrg
439ee82cb62Smrg    MGA DDX: make it possible to find EXA support
440ee82cb62Smrg    
441ee82cb62Smrg    Newer versions of the xserver stricter requirements on header order
442ee82cb62Smrg    which caused the configure tests for EXA support to erroneously fail.
443ee82cb62Smrg    Since XAA was already removed from an earlier version of xserver, the
444ee82cb62Smrg    configure failure meant no acceleration was possible. Patch configure
445ee82cb62Smrg    tests similar to r128.
446ee82cb62Smrg    
447ee82cb62Smrg    Reviewed-by: Adam Jackson <ajax@redhat.com>
448ee82cb62Smrg
449493f84f4Smrgcommit 8ed77eb7920f375e9490a31f907eccb02fb123cd
450493f84f4SmrgAuthor: Matt Turner <mattst88@gmail.com>
451493f84f4SmrgDate:   Thu Feb 19 13:39:18 2015 -0800
452493f84f4Smrg
453493f84f4Smrg    xf86-video-mga 1.6.4
454493f84f4Smrg
455493f84f4Smrgcommit 132dee029e36c9a91a85f178885e94a9f9b5ee37
456493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com>
457493f84f4SmrgDate:   Tue Jul 29 14:35:46 2014 -0400
458493f84f4Smrg
459493f84f4Smrg    undef DISABLE_VGA_IO
460493f84f4Smrg    
461493f84f4Smrg    Dead conditional ever since m12n, must not be needed.
462493f84f4Smrg    
463493f84f4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
464493f84f4Smrg
465493f84f4Smrgcommit cf46b1017a2663c59f07abd417573b9580f0145f
466493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com>
467493f84f4SmrgDate:   Tue Jul 29 09:14:15 2014 -0400
468493f84f4Smrg
469493f84f4Smrg    dri: Stop (uselessly) initializing the ValidateTree hooks
470493f84f4Smrg    
471493f84f4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
472493f84f4Smrg
473493f84f4Smrgcommit 1a5bc65f27e76263818a44ddbc4197f6083077cf
474493f84f4SmrgAuthor: Adam Jackson <ajax@redhat.com>
475493f84f4SmrgDate:   Thu May 22 12:48:27 2014 -0400
476493f84f4Smrg
477493f84f4Smrg    man: Don't mention the HAL
478493f84f4Smrg    
479493f84f4Smrg    I mentioned it once, but I think I got away with it all right.
480493f84f4Smrg    
481493f84f4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
482493f84f4Smrg
483493f84f4Smrgcommit d2c65c24e94dca1e8fb16c851d0e2fe41bf5d1c6
484493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com>
485493f84f4SmrgDate:   Thu Mar 13 23:17:52 2014 -0400
486493f84f4Smrg
487493f84f4Smrg    fix a type in previous lockup in the mga driver fix
488493f84f4Smrg    
489493f84f4Smrg    Oh, I had a typo in that patch - so please commit this to fix it.
490493f84f4Smrg    
491493f84f4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
492493f84f4Smrg
493493f84f4Smrgcommit 0789f3f2799e6497e9e2e7488da679c03b7fa468
494493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com>
495493f84f4SmrgDate:   Thu Mar 13 18:25:56 2014 -0400
496493f84f4Smrg
497493f84f4Smrg    xf86-video-mga: fix a lockup in the mga driver
498493f84f4Smrg    
499493f84f4Smrg    I've had a Xserver lockup in the mga driver, examining it with gdb showed
500493f84f4Smrg    this obviously broken loop:
5011e423a8fSmrg            count = INREG(MGAREG_VCOUNT) + 2;
5021e423a8fSmrg            while(INREG(MGAREG_VCOUNT) < count);
503493f84f4Smrg    
504493f84f4Smrg    It reads the line counter and waits until the counter advances by two. The
505493f84f4Smrg    cause of the lockup is this - if the kernel reschedules the Xorg process
506493f84f4Smrg    and lets it run in such a moment when INREG(MGAREG_VCOUNT) returns the
507493f84f4Smrg    maximum (or maximum minus 1) line count, the loop never exits.
508493f84f4Smrg    
509493f84f4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
510493f84f4Smrg
511493f84f4Smrgcommit 62ba63f687d7b99aff7c88ffd2774f15a2471ce0
512493f84f4SmrgAuthor: Mikulas Patocka <mpatocka@redhat.com>
513493f84f4SmrgDate:   Fri Jan 17 16:04:26 2014 -0500
514493f84f4Smrg
515493f84f4Smrg    xf86-video-mga: set the pan_ctl register
516493f84f4Smrg    
517493f84f4Smrg    On my Matrox G550 most videomodes in Xorg didn't work. I found out that it
518493f84f4Smrg    works if Xorg pixel clock is similar to the pixel clock set on framebuffer
519493f84f4Smrg    console.
520493f84f4Smrg    
521493f84f4Smrg    Further analysis showed that the Linux framebuffer driver sets the pan_ctl
522493f84f4Smrg    register (the register 0xa2) according to the pixel clock, the Xorg driver
523493f84f4Smrg    doesn't set it.
524493f84f4Smrg    
525493f84f4Smrg    I copied the code to set the pan_ctl register from the Linux kernel to the
526493f84f4Smrg    Xorg driver, and most videomodes in Xorg work.
527493f84f4Smrg    
528493f84f4Smrg    The pan_ctl register is required for both analog and digital output.
529493f84f4Smrg    
530493f84f4Smrg    The pan_ctl register is saved and restored, this is required so that we
531493f84f4Smrg    restore text-mode screen or Linux framebuffer correctly.
532493f84f4Smrg    
533493f84f4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
534493f84f4Smrg
535acd6767fSmrgcommit f647727a2c1d4c2a9261c411cd3df71c3c9f0c06
536acd6767fSmrgAuthor: Dave Airlie <airlied@redhat.com>
537acd6767fSmrgDate:   Thu Dec 5 12:09:27 2013 +1000
538acd6767fSmrg
539acd6767fSmrg    mga: bump release to 1.6.3
540acd6767fSmrg
541acd6767fSmrgcommit 55525bdfc00b0b746401f6ea6ed289048e9d06eb
542acd6767fSmrgAuthor: Dave Airlie <airlied@redhat.com>
543acd6767fSmrgDate:   Thu Dec 5 11:51:39 2013 +1000
544acd6767fSmrg
545acd6767fSmrg    mga: fix XAA runtime
546acd6767fSmrg    
547acd6767fSmrg    XAA->USE_XAA add USE_XAA.
548acd6767fSmrg    
549acd6767fSmrg    Tested-by: Avengence on #xorg-devel
550acd6767fSmrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
551acd6767fSmrg
552acd6767fSmrgcommit 6aa94687233f55a8044efe83cac82b04ab19609f
553acd6767fSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
554acd6767fSmrgDate:   Sun Nov 17 10:27:42 2013 -0800
555acd6767fSmrg
556acd6767fSmrg    Remove mga_esc.c vestigal stub
557acd6767fSmrg    
558acd6767fSmrg    Previously contained MGA HAL code, was left an empty shell by the
559acd6767fSmrg    removal of USEMGAHAL in commit 94bbeb132c7eda.
560acd6767fSmrg    
561acd6767fSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
562acd6767fSmrg    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
563acd6767fSmrg
564acd6767fSmrgcommit e9109a0b04695d6971c94abe271dda2dc1a5e886
565acd6767fSmrgAuthor: Tormod Volden <debian.tormod@gmail.com>
566acd6767fSmrgDate:   Thu Oct 31 22:48:18 2013 +0100
567acd6767fSmrg
568acd6767fSmrg    mga: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr
569acd6767fSmrg    
570acd6767fSmrg    Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
571acd6767fSmrg
572acd6767fSmrgcommit a77b9c5143591672fbe56f4428ced439c1f4d0f3
573acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org>
574acd6767fSmrgDate:   Mon Jul 29 13:02:21 2013 +0200
575acd6767fSmrg
576acd6767fSmrg    Disable HW cursor by default on G200 server chips
577acd6767fSmrg    
578acd6767fSmrg    Disable HW cursor by default on G200 server chips as these chips a
579acd6767fSmrg    re often used with a remote graphics link which cannot display
580acd6767fSmrg    the HW cursor.
581acd6767fSmrg    This can be overridden by a config option.
582acd6767fSmrg    Most desktops today use ARGB cursors anyhow which are not
583acd6767fSmrg    supported by this driver anyhow. Thus the performance penalty
584acd6767fSmrg    should be irrelevant.
585acd6767fSmrg    
586acd6767fSmrg    Signed-off-by: Egbert Eich <eich@freedesktop.org>
587acd6767fSmrg
588acd6767fSmrgcommit dba8778b9214dc3794198029fc6d59b3e97700d4
589acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org>
590acd6767fSmrgDate:   Mon Jul 29 13:01:45 2013 +0200
591acd6767fSmrg
592acd6767fSmrg    Restructure code to make it more readable
593acd6767fSmrg    
594acd6767fSmrg    With the previous structure it wasn't immediately clear when SecondCrtc
595acd6767fSmrg    and HWCursor were set to which value. Make the code more readable.
596acd6767fSmrg    
597acd6767fSmrg    Signed-off-by: Egbert Eich <eich@freedesktop.org>
598acd6767fSmrg
599acd6767fSmrgcommit cbcee5de1ba02c8a58bae932a0cb98093dccefd9
600acd6767fSmrgAuthor: Tormod Volden <debian.tormod@gmail.com>
601acd6767fSmrgDate:   Thu Oct 17 22:01:20 2013 +0200
602acd6767fSmrg
603acd6767fSmrg    Fix dual head crash without XAA
604acd6767fSmrg    
605acd6767fSmrg    https://launchpad.net/bugs/1180986
606acd6767fSmrg    
607acd6767fSmrg    Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
608acd6767fSmrg    Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com>
609acd6767fSmrg    Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
610acd6767fSmrg
611acd6767fSmrgcommit 15815c8612694a89d0d8593b3e603fdcdeacdd05
612acd6767fSmrgAuthor: Andy MacLean <andy-ub1@themacleans.org.uk>
613acd6767fSmrgDate:   Thu Oct 17 19:51:36 2013 +0200
614acd6767fSmrg
615acd6767fSmrg    Unbreak dual head (xinerama)
616acd6767fSmrg    
617acd6767fSmrg    This patch has been used in Debian, Ubuntu and Gentoo for years.
618acd6767fSmrg    
619acd6767fSmrg    https://bugs.freedesktop.org/show_bug.cgi?id=18472
620acd6767fSmrg    https://launchpad.net/bugs/292214
621acd6767fSmrg    https://bugs.gentoo.org/show_bug.cgi?id=265100
622acd6767fSmrg    
623acd6767fSmrg    Signed-off-by: Andy MacLean <andy-ub1@themacleans.org.uk>
624acd6767fSmrg    Reviewed-by: Cyril Brulebois <kibi@debian.org>
625acd6767fSmrg    Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com>
626acd6767fSmrg    Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
627acd6767fSmrg
628acd6767fSmrgcommit 12af175fee1d3f6f17f8391ec642d904deca3783
629acd6767fSmrgAuthor: Egbert Eich <eich@freedesktop.org>
630acd6767fSmrgDate:   Tue Jun 7 19:31:16 2011 +0200
631acd6767fSmrg
632acd6767fSmrg    Disable Linear Expansion on BE
633acd6767fSmrg    
634acd6767fSmrg    Linear Expansion doesn't work on BE as the bit order in
635acd6767fSmrg    a word is reversed. ScreenToScreenColorExpansion allows
636acd6767fSmrg    to adjust the bit order in a byte, still the bytes have
637acd6767fSmrg    the wrong order.
638acd6767fSmrg    
639acd6767fSmrg    Reviewed-by:  <wharms@bfs.de>
640acd6767fSmrg    Signed-off-by: Egbert Eich <eich@freedesktop.org>
641acd6767fSmrg
642acd6767fSmrgcommit 49381ff2c3aa98be5bb84494b2ad3f81a0d31bcc
643acd6767fSmrgAuthor: Julien Cristau <jcristau@debian.org>
644acd6767fSmrgDate:   Mon Jan 7 23:04:36 2013 +0100
645acd6767fSmrg
646acd6767fSmrg    Restrict kernel driver matching to g200 server chips
647acd6767fSmrg    
648acd6767fSmrg    Otherwise we might catch devices handled by matroxfb, not the mgag200
649acd6767fSmrg    kms driver.
650acd6767fSmrg    
651acd6767fSmrg    Debian bug#697532
652acd6767fSmrg    
653acd6767fSmrg    Reported-by: olafBuddenhagen@gmx.net
654acd6767fSmrg    Reviewed-by: Dave Airlie <airlied@redhat.com>
655acd6767fSmrg    Signed-off-by: Julien Cristau <jcristau@debian.org>
656acd6767fSmrg
6570bb88ba4Smrgcommit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
6580bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
6590bb88ba4SmrgDate:   Fri Sep 28 11:36:44 2012 +1000
6600bb88ba4Smrg
6610bb88ba4Smrg    mga: bump release to 1.6.2
6620bb88ba4Smrg
6630bb88ba4Smrgcommit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6
6640bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
6650bb88ba4SmrgDate:   Fri Sep 28 10:54:00 2012 +1000
6660bb88ba4Smrg
6670bb88ba4Smrg    mga: bring dri1 back to life.
6680bb88ba4Smrg    
6690bb88ba4Smrg    we need to at least setup the memory manager bits so dri1 clients
6700bb88ba4Smrg    get a backbuffer. this at least gets gears working again without XAA.
6710bb88ba4Smrg    
6720bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
6730bb88ba4Smrg
6740bb88ba4Smrgcommit e777a2845bfeefad386db35d694e4b1cd74a0dd5
6750bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
6760bb88ba4SmrgDate:   Wed Sep 26 15:18:44 2012 +1000
6770bb88ba4Smrg
6780bb88ba4Smrg    mga: add stub storm functions if not using XAA
6790bb88ba4Smrg    
6800bb88ba4Smrg    If we aren't using XAA just add stub storm init/sync functions.
6810bb88ba4Smrg    
6820bb88ba4Smrg    This lets the driver load yay.
6830bb88ba4Smrg    
6840bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
6850bb88ba4Smrg
6860bb88ba4Smrgcommit 220e06fefe77175d9827954e61549eadda245d9a
6870bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com>
6880bb88ba4SmrgDate:   Tue Sep 25 08:54:42 2012 -0400
6890bb88ba4Smrg
6900bb88ba4Smrg    Remove mibstore.h
6910bb88ba4Smrg    
6920bb88ba4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
6930bb88ba4Smrg
6940bb88ba4Smrgcommit cd41eacaeabf8227197d605b055713ca654633d5
6950bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
6960bb88ba4SmrgDate:   Tue Jul 17 16:05:09 2012 +1000
6970bb88ba4Smrg
6980bb88ba4Smrg    xf86-video-mga: bump to version 1.6.1
6990bb88ba4Smrg    
7000bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
7010bb88ba4Smrg
7020bb88ba4Smrgcommit f11a407ceb0857bb0d33811511117b490a8ae6ee
7030bb88ba4SmrgAuthor: Dave Airlie <airlied@gmail.com>
7040bb88ba4SmrgDate:   Sun Jul 15 19:41:28 2012 +1000
7050bb88ba4Smrg
7060bb88ba4Smrg    mga: fix after XAA removal
7070bb88ba4Smrg    
7080bb88ba4Smrg    Fix mga build after XAA removal.
7090bb88ba4Smrg    
7100bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
7110bb88ba4Smrg
7120bb88ba4Smrgcommit fa0f3092ed38ce71ba9f65156bde306eb63feaf8
7130bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
7140bb88ba4SmrgDate:   Mon Jul 2 12:08:05 2012 +0100
7150bb88ba4Smrg
7160bb88ba4Smrg    mga: bump to 1.6.0
7170bb88ba4Smrg    
7180bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
7190bb88ba4Smrg
7200bb88ba4Smrgcommit 7b6dcc4d5768cc8d17a1f664155ebdc8ca8c042e
7210bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
7220bb88ba4SmrgDate:   Wed Jun 6 09:23:31 2012 +0100
7230bb88ba4Smrg
7240bb88ba4Smrg    mga: port to new compat API.
7250bb88ba4Smrg    
7260bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
7270bb88ba4Smrg
7280bb88ba4Smrgcommit 0cb8ba6dc5e7bf4179174f9f17e211df7d89bd41
7290bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
7300bb88ba4SmrgDate:   Wed May 23 23:40:32 2012 -0700
7310bb88ba4Smrg
7320bb88ba4Smrg    Add const qualifier to char *from in MGAdoDDC
7330bb88ba4Smrg    
7340bb88ba4Smrg    Only used to store arguments to pass as printf %s strings to xf86DrvMsg
7350bb88ba4Smrg    
7360bb88ba4Smrg    Fixes gcc warnings:
7370bb88ba4Smrg    mga_driver.c: In function 'MGAdoDDC':
7380bb88ba4Smrg    mga_driver.c:1338:7: warning: assignment discards qualifiers from pointer target type
7390bb88ba4Smrg    mga_driver.c:1343:11: warning: assignment discards qualifiers from pointer target type
7400bb88ba4Smrg    mga_driver.c:1351:8: warning: assignment discards qualifiers from pointer target type
7410bb88ba4Smrg    mga_driver.c:1359:8: warning: assignment discards qualifiers from pointer target type
7420bb88ba4Smrg    
7430bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
7440bb88ba4Smrg    Reviewed-by: Dave Airlie <airlied@redhat.com>
7450bb88ba4Smrg
7460bb88ba4Smrgcommit 3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f
7470bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
7480bb88ba4SmrgDate:   Wed May 23 23:34:07 2012 -0700
7490bb88ba4Smrg
7500bb88ba4Smrg    Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.h
7510bb88ba4Smrg    
7520bb88ba4Smrg    Silences deprecation warnings from xf86PciInfo.h in current Xorg servers
7530bb88ba4Smrg    
7540bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
7550bb88ba4Smrg    Reviewed-by: Dave Airlie <airlied@redhat.com>
7560bb88ba4Smrg
7570bb88ba4Smrgcommit 0af7dba78559ce82b4c3eed0862415efcde51863
7580bb88ba4SmrgAuthor: Dave Airlie <airlied@redhat.com>
7590bb88ba4SmrgDate:   Thu May 17 10:19:21 2012 +0100
7600bb88ba4Smrg
7610bb88ba4Smrg    mga: don't bind to device if there is a kernel driver
7620bb88ba4Smrg    
7630bb88ba4Smrg    this should only pick up KMS drivers and not old drm drivers.
7640bb88ba4Smrg    
7650bb88ba4Smrg    Signed-off-by: Dave Airlie <airlied@redhat.com>
7660bb88ba4Smrg
7670bb88ba4Smrgcommit 3991971c23ebe596742c004b1e583dfb1aa14ec4
7680bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
7690bb88ba4SmrgDate:   Fri Mar 23 19:02:40 2012 -0700
7700bb88ba4Smrg
7710bb88ba4Smrg    xf86-video-mga 1.5.0
7720bb88ba4Smrg    
7730bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
7740bb88ba4Smrg
7750bb88ba4Smrgcommit 4c4beaf628c9c5dd531605e40696ed31db0e97b8
7760bb88ba4SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net>
7770bb88ba4SmrgDate:   Wed Jan 4 15:15:07 2012 +1000
7780bb88ba4Smrg
7790bb88ba4Smrg    Untangle XF86DRI from the driver-specific DRI define
7800bb88ba4Smrg    
7810bb88ba4Smrg    XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
7820bb88ba4Smrg    itself does exactly nothing other than not fill in the CFLAGS
7830bb88ba4Smrg    and thus stop the driver from compiling.
7840bb88ba4Smrg    
7850bb88ba4Smrg    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
7860bb88ba4Smrg
7870bb88ba4Smrgcommit 9223c44a731f48c66c226eb88dcb6f9d574cb599
7880bb88ba4SmrgAuthor: Julien Cristau <jcristau@debian.org>
7890bb88ba4SmrgDate:   Tue Jan 3 23:35:18 2012 +0100
7900bb88ba4Smrg
7910bb88ba4Smrg    When we can't load the xaa or exa modules, use shadowfb instead
7920bb88ba4Smrg    
7930bb88ba4Smrg    Signed-off-by: Julien Cristau <jcristau@debian.org>
7940bb88ba4Smrg
7950bb88ba4Smrgcommit cc9d2e808de20723c9035952242d966455d583b7
7960bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
7970bb88ba4SmrgDate:   Wed Dec 28 19:44:40 2011 -0800
7980bb88ba4Smrg
7990bb88ba4Smrg    Check MGAAllocAdaptor() for memory allocation failure
8000bb88ba4Smrg    
8010bb88ba4Smrg    If it couldn't allocate memory, don't attempt to write a bunch of values
8020bb88ba4Smrg    to the NULL pointer before returning it, but just pass the NULL along
8030bb88ba4Smrg    right away.
8040bb88ba4Smrg    
8050bb88ba4Smrg    Resolves parfait warnings of the form:
8060bb88ba4Smrg    
8070bb88ba4Smrg    Error: Null pointer dereference (CWE 476)
8080bb88ba4Smrg       Write to null pointer 'adapt'
8090bb88ba4Smrg            at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'.
8100bb88ba4Smrg              Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320.
8110bb88ba4Smrg              Null pointer introduced at line 237 in function 'MGAAllocAdaptor'.
8120bb88ba4Smrg    
8130bb88ba4Smrg    repeated for every line writing to the adapt pointer in each function.
8140bb88ba4Smrg    
8150bb88ba4Smrg    [ This bug was found by the Parfait 0.4.2 bug checking tool.
8160bb88ba4Smrg      For more information see http://labs.oracle.com/projects/parfait/ ]
8170bb88ba4Smrg    
8180bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
8190bb88ba4Smrg    Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
8200bb88ba4Smrg
8210bb88ba4Smrgcommit 644ba5d11049e63ea61b5cc4fb889b0f840965ff
8220bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com>
8230bb88ba4SmrgDate:   Wed Dec 7 15:42:39 2011 -0500
8240bb88ba4Smrg
8250bb88ba4Smrg    Add support for Video Memory greater then 8M
8260bb88ba4Smrg    
8270bb88ba4Smrg    Expand memory mapping of framebuffer from 8 to 16MB
8280bb88ba4Smrg    
8290bb88ba4Smrg    Fix segfault on redhat distibution
8300bb88ba4Smrg    
8310bb88ba4Smrg    Signed-off-by: Christian Toutant <ctoutant@matrox.com>
8320bb88ba4Smrg
8330bb88ba4Smrgcommit d9cf07a4f424b2beb844ea1b3ec5d468e79a747c
8340bb88ba4SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com>
8350bb88ba4SmrgDate:   Sat Oct 29 16:34:41 2011 -0700
8360bb88ba4Smrg
8370bb88ba4Smrg    Include "xf86Modes.h" for xf86ModeBandwidth
8380bb88ba4Smrg    
8390bb88ba4Smrg    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
8400bb88ba4Smrg
8410bb88ba4Smrgcommit f9acf37be49844bea8165be9786afe37fd999229
8420bb88ba4SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com>
8430bb88ba4SmrgDate:   Sat Oct 29 16:31:08 2011 -0700
8440bb88ba4Smrg
8450bb88ba4Smrg    Include <unistd.h> for usleep
8460bb88ba4Smrg    
8470bb88ba4Smrg    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
8480bb88ba4Smrg
8490bb88ba4Smrgcommit 07792ef41f33aa5419168263637e34ee614f26e2
8500bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com>
8510bb88ba4SmrgDate:   Mon Sep 26 22:38:17 2011 -0400
8520bb88ba4Smrg
8530bb88ba4Smrg    Remove calls to xf86IsPc98()
8540bb88ba4Smrg    
8550bb88ba4Smrg    Reviewed-by: Jamey Sharp <jamey@minilop.net>
8560bb88ba4Smrg    Signed-off-by: Matt Turner <mattst88@gmail.com>
8570bb88ba4Smrg
8580bb88ba4Smrgcommit 560967b4ffdb103f95121c43708dd5fc680a5045
8590bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com>
8600bb88ba4SmrgDate:   Mon Sep 26 22:37:04 2011 -0400
8610bb88ba4Smrg
8620bb88ba4Smrg    Fix printf format specifier warning
8630bb88ba4Smrg    
8640bb88ba4Smrg    Signed-off-by: Matt Turner <mattst88@gmail.com>
8650bb88ba4Smrg
8660bb88ba4Smrgcommit 1036e32e006d496023553ea566cb13ae93933719
8670bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com>
8680bb88ba4SmrgDate:   Mon Sep 26 22:35:48 2011 -0400
8690bb88ba4Smrg
8700bb88ba4Smrg    Remove if(E != NULL) checks around free(E)
8710bb88ba4Smrg    
8720bb88ba4Smrg    Reviewed-by: Jamey Sharp <jamey@minilop.net>
8730bb88ba4Smrg    Signed-off-by: Matt Turner <mattst88@gmail.com>
8740bb88ba4Smrg
8750bb88ba4Smrgcommit ee09a9a340f8946f2d4a71a431b64189dbb5c256
8760bb88ba4SmrgAuthor: Matt Turner <mattst88@gmail.com>
8770bb88ba4SmrgDate:   Mon Sep 26 22:22:09 2011 -0400
8780bb88ba4Smrg
8790bb88ba4Smrg    Remove xalloc/xcalloc/xrealloc/xfree
8800bb88ba4Smrg    
8810bb88ba4Smrg    Reviewed-by: Jamey Sharp <jamey@minilop.net>
8820bb88ba4Smrg    Signed-off-by: Matt Turner <mattst88@gmail.com>
8830bb88ba4Smrg
8840bb88ba4Smrgcommit 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1
8850bb88ba4SmrgAuthor: Jamey Sharp <jamey@minilop.net>
8860bb88ba4SmrgDate:   Thu Sep 15 10:29:11 2011 -0500
8870bb88ba4Smrg
8880bb88ba4Smrg    Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
8890bb88ba4Smrg    
8900bb88ba4Smrg    This patch produced with:
8911e423a8fSmrg            for f in `git grep -Fwl USEMGAHAL`; do
8921e423a8fSmrg                    unifdef -B -UUSEMGAHAL $f | sponge $f
8931e423a8fSmrg            done
8940bb88ba4Smrg    
8950bb88ba4Smrg    Adam Jackson wrote:
8960bb88ba4Smrg    
8971e423a8fSmrg            Hey, so, remember back in the dark ages when dualhead was this
8981e423a8fSmrg            insanely wild differentiating feature?  Matrox thought it was so
8991e423a8fSmrg            special, in fact, that they hid most of the implementation of it
9001e423a8fSmrg            (and a bunch of other stuff) in a binary-only blob called the
9011e423a8fSmrg            HALlib.  As you'd expect it was pretty much a cut-and-paste of
9021e423a8fSmrg            the relevant Windows code, and then some open glue to keep it
9031e423a8fSmrg            working; clientlx.c is that glue.
9040bb88ba4Smrg    
9051e423a8fSmrg            I guess the theory was that if you don't tell people which
9061e423a8fSmrg            registers to duplicate to implement a second pipe in their own
9071e423a8fSmrg            hardware, they won't figure it out?  A pretty eyeroll-worthy
9081e423a8fSmrg            idea even at the time, and definitely not something we should be
9091e423a8fSmrg            condoning anymore.
9100bb88ba4Smrg    
9111e423a8fSmrg            Kill it with fire, but while you're at it, untangle the hideous
9121e423a8fSmrg            mess of MGA_HAL() macros too.
9130bb88ba4Smrg    
9140bb88ba4Smrg    Signed-off-by: Jamey Sharp <jamey@minilop.net>
9150bb88ba4Smrg    Cc: Adam Jackson <ajax@redhat.com>
9160bb88ba4Smrg
9170bb88ba4Smrgcommit ae90c47503bc1015a50e7ea6d22ec10e5e0d4113
9180bb88ba4SmrgAuthor: Jamey Sharp <jamey@minilop.net>
9190bb88ba4SmrgDate:   Tue Sep 13 16:01:57 2011 -0500
9200bb88ba4Smrg
9210bb88ba4Smrg    Nothing uses clientlx.c, so delete it.
9220bb88ba4Smrg    
9230bb88ba4Smrg    Adam Jackson wrote:
9240bb88ba4Smrg    
9251e423a8fSmrg            Hey, so, remember back in the dark ages when dualhead was this
9261e423a8fSmrg            insanely wild differentiating feature?  Matrox thought it was so
9271e423a8fSmrg            special, in fact, that they hid most of the implementation of it
9281e423a8fSmrg            (and a bunch of other stuff) in a binary-only blob called the
9291e423a8fSmrg            HALlib.  As you'd expect it was pretty much a cut-and-paste of
9301e423a8fSmrg            the relevant Windows code, and then some open glue to keep it
9311e423a8fSmrg            working; clientlx.c is that glue.
9320bb88ba4Smrg    
9331e423a8fSmrg            I guess the theory was that if you don't tell people which
9341e423a8fSmrg            registers to duplicate to implement a second pipe in their own
9351e423a8fSmrg            hardware, they won't figure it out?  A pretty eyeroll-worthy
9361e423a8fSmrg            idea even at the time, and definitely not something we should be
9371e423a8fSmrg            condoning anymore.
9380bb88ba4Smrg    
9391e423a8fSmrg            Kill it with fire ...
9400bb88ba4Smrg    
9410bb88ba4Smrg    Signed-off-by: Jamey Sharp <jamey@minilop.net>
9420bb88ba4Smrg    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
9430bb88ba4Smrg    Reviewed-by: Adam Jackson <ajax@redhat.com>
9440bb88ba4Smrg
9450bb88ba4Smrgcommit 01ca2186ea028b2549de509b51726aa08519fce0
9460bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com>
9470bb88ba4SmrgDate:   Tue Sep 20 13:07:16 2011 -0400
9480bb88ba4Smrg
9490bb88ba4Smrg    Reset tagfifo for renesas.
9500bb88ba4Smrg    
9510bb88ba4Smrg    For renesas, we need to reset tagfifo after a mode switch.
9520bb88ba4Smrg    
9530bb88ba4Smrg    Signed-off-by: Christian Toutant <ctoutant@matrox.com>
9540bb88ba4Smrg
9550bb88ba4Smrgcommit c083bf0a66bef9a4345847f39be5fb895c211f79
9560bb88ba4SmrgAuthor: Christian Toutant <ctoutant@matrox.com>
9570bb88ba4SmrgDate:   Wed Aug 3 09:45:13 2011 -0400
9580bb88ba4Smrg
9590bb88ba4Smrg    Added support for G200SE Pilot3
9600bb88ba4Smrg    
9610bb88ba4Smrg    Optimize use of bandwidth and increase maximum resolution to 1920x1200
9620bb88ba4Smrg    
9630bb88ba4Smrg    Signed-off-by: Christian Toutant <ctoutant@matrox.com>
9640bb88ba4Smrg
9650bb88ba4Smrgcommit 43280e6521815582f219d42821d896093c9c0d5f
9660bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com>
9670bb88ba4SmrgDate:   Wed Jun 22 17:02:29 2011 -0400
9680bb88ba4Smrg
9690bb88ba4Smrg    Don't include xf86Priv.h
9700bb88ba4Smrg    
9710bb88ba4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
9720bb88ba4Smrg
9730bb88ba4Smrgcommit 5f1b04e86e79938c8158055a777280a649f95510
9740bb88ba4SmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
9750bb88ba4SmrgDate:   Fri Dec 17 09:00:46 2010 -0500
9760bb88ba4Smrg
9770bb88ba4Smrg    added support for G200ER.
9780bb88ba4Smrg
9790bb88ba4Smrgcommit f7a2ef60e18e2cc464f69c1cad4681096c645651
9800bb88ba4SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com>
9810bb88ba4SmrgDate:   Sat Oct 30 09:38:31 2010 -0700
9820bb88ba4Smrg
9830bb88ba4Smrg    Sun's copyrights now belong to Oracle
9840bb88ba4Smrg    
9850bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
9860bb88ba4Smrg
9870bb88ba4Smrgcommit 636c3c88e7e9cb30010fe1731cd7356849f3f172
9880bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com>
9890bb88ba4SmrgDate:   Thu Oct 14 14:36:06 2010 -0400
9900bb88ba4Smrg
9910bb88ba4Smrg    Don't allow the config file to override BIOS location
9920bb88ba4Smrg    
9930bb88ba4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
9940bb88ba4Smrg
9950bb88ba4Smrgcommit 0bd44fad450843b7f1c35c70ab356a2b250d107d
9960bb88ba4SmrgAuthor: Jesse Adkins <jesserayadkins@gmail.com>
9970bb88ba4SmrgDate:   Tue Sep 28 13:29:51 2010 -0700
9980bb88ba4Smrg
9990bb88ba4Smrg    Purge cvs tags.
10000bb88ba4Smrg    
10010bb88ba4Smrg    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
10020bb88ba4Smrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
10030bb88ba4Smrg
10040bb88ba4Smrgcommit 951474c7fcd1b28d3178a6644d58958cb3bdf5a8
10050bb88ba4SmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
10060bb88ba4SmrgDate:   Wed Aug 25 11:16:27 2010 -0400
10070bb88ba4Smrg
10080bb88ba4Smrg    modified G200SE conditionnal statement about revision register for products compatibility.
10090bb88ba4Smrg
10100bb88ba4Smrgcommit c08b112bfe14fbfe713e4757eb0b704c8ed1f339
10110bb88ba4SmrgAuthor: Adam Jackson <ajax@redhat.com>
10120bb88ba4SmrgDate:   Tue Aug 10 10:58:41 2010 -0400
10130bb88ba4Smrg
10140bb88ba4Smrg    xf86-video-mga 1.4.13
10150bb88ba4Smrg    
10160bb88ba4Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
10170bb88ba4Smrg
1018d7be9c72Smrgcommit 411570523550e1997bbd83815990bdda8cfd129c
1019d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1020d7be9c72SmrgDate:   Wed Jul 21 16:49:04 2010 -0400
1021d7be9c72Smrg
1022d7be9c72Smrg    config: add comments for main statements
1023d7be9c72Smrg
1024d7be9c72Smrgcommit 99892c4f416e9669a62963d29e7dee760382da95
1025d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1026d7be9c72SmrgDate:   Wed Jul 21 16:07:00 2010 -0400
1027d7be9c72Smrg
1028d7be9c72Smrg    config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
1029d7be9c72Smrg    
1030d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1031d7be9c72Smrg
1032d7be9c72Smrgcommit 1f78a33e576898a0b7fd542f772064ad2f01e2f9
1033d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1034d7be9c72SmrgDate:   Wed Jul 21 14:37:41 2010 -0400
1035d7be9c72Smrg
1036d7be9c72Smrg    config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
1037d7be9c72Smrg    
1038d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1039d7be9c72Smrg
1040d7be9c72Smrgcommit fb311dc7e72a956c5a03e63757ec96b6626afb3a
1041d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1042d7be9c72SmrgDate:   Wed Jul 21 14:05:22 2010 -0400
1043d7be9c72Smrg
1044d7be9c72Smrg    config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
1045d7be9c72Smrg    
1046d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1047d7be9c72Smrg
1048d7be9c72Smrgcommit f2c386e5a7b9b5682db40d53e9f7b92e7d41ceba
1049d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1050d7be9c72SmrgDate:   Wed Jul 21 09:27:42 2010 -0400
1051d7be9c72Smrg
1052d7be9c72Smrg    config: complete AC_INIT m4 quoting
1053d7be9c72Smrg    
1054d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1055d7be9c72Smrg
1056d7be9c72Smrgcommit 01d47165804c6c3a674fda7a9629e2f1d0f8b2db
1057d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1058d7be9c72SmrgDate:   Tue Jul 20 21:54:11 2010 -0400
1059d7be9c72Smrg
1060d7be9c72Smrg    config: remove unrequired AC_SUBST([DRI_CFLAGS])
1061d7be9c72Smrg    
1062d7be9c72Smrg    This macro is called by PKG_CHECK_MODULES
1063d7be9c72Smrg    
1064d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1065d7be9c72Smrg
1066d7be9c72Smrgcommit b84e08801f18292b3af73ac250788941fa2685a0
1067d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1068d7be9c72SmrgDate:   Tue Jul 20 21:44:57 2010 -0400
1069d7be9c72Smrg
1070d7be9c72Smrg    config: remove unrequired AC_SUBST([XORG_CFLAGS])
1071d7be9c72Smrg    
1072d7be9c72Smrg    This macro is called by PKG_CHECK_MODULES
1073d7be9c72Smrg    
1074d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1075d7be9c72Smrg
1076d7be9c72Smrgcommit 9d7ae5d171555c22c654b5ef14840f7c8c3d2124
1077d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1078d7be9c72SmrgDate:   Tue Jul 20 20:24:42 2010 -0400
1079d7be9c72Smrg
1080d7be9c72Smrg    config: remove unrequired AC_HEADER_STDC
1081d7be9c72Smrg    
1082d7be9c72Smrg    Autoconf says:
1083d7be9c72Smrg    "This macro is obsolescent, as current systems have conforming
1084d7be9c72Smrg    header files. New programs need not use this macro".
1085d7be9c72Smrg    
1086d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1087d7be9c72Smrg
1088d7be9c72Smrgcommit ac6e0b60b18173598865a66333e0cfa383a61eec
1089d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1090d7be9c72SmrgDate:   Tue Jul 20 19:41:31 2010 -0400
1091d7be9c72Smrg
1092d7be9c72Smrg    config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
1093d7be9c72Smrg    
1094d7be9c72Smrg    XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
1095d7be9c72Smrg    AC_PROG_C_C99. This sets gcc with -std=gnu99.
1096d7be9c72Smrg    If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
1097d7be9c72Smrg    
1098d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1099d7be9c72Smrg
1100d7be9c72Smrgcommit a84d4a8883c5c853396c644cbc6db0f7f838f6bf
1101d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1102d7be9c72SmrgDate:   Tue Jul 20 18:45:19 2010 -0400
1103d7be9c72Smrg
1104d7be9c72Smrg    config: update AC_PREREQ statement to 2.60
1105d7be9c72Smrg    
1106d7be9c72Smrg    Unrelated to the previous patches, the new value simply reflects
1107d7be9c72Smrg    the reality that the minimum level for autoconf to configure
1108d7be9c72Smrg    all x.org modules is 2.60 dated June 2006.
1109d7be9c72Smrg    
1110d7be9c72Smrg    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
1111d7be9c72Smrg    
1112d7be9c72Smrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1113d7be9c72Smrg
1114d7be9c72Smrgcommit 3f28d8a8c0c1cf2885475ecd5cad0eb98313ce6f
1115d7be9c72SmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1116d7be9c72SmrgDate:   Tue Jul 20 16:15:29 2010 -0400
1117d7be9c72Smrg
1118d7be9c72Smrg    config: upgrade to util-macros 1.8 for additional man page support
1119d7be9c72Smrg    
1120d7be9c72Smrg    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
1121d7be9c72Smrg    The value of MAN_SUBST is the same for all X.Org packages.
1122d7be9c72Smrg
1123d7be9c72Smrgcommit 42d54a84a810c156c50b8f6643e4c8f315ed5f3e
1124d7be9c72SmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1125d7be9c72SmrgDate:   Thu Jul 22 10:51:15 2010 -0400
1126d7be9c72Smrg
1127d7be9c72Smrg    adjusted max bandwith and max pitch values for G200SE
1128d7be9c72Smrg
1129d7be9c72Smrgcommit 306c46f6a627e51b051c55ce3d7ffc9a87d2e452
1130d7be9c72SmrgAuthor: Adam Jackson <ajax@redhat.com>
1131d7be9c72SmrgDate:   Thu May 13 16:12:34 2010 -0400
1132d7be9c72Smrg
1133d7be9c72Smrg    mga 1.4.12
1134d7be9c72Smrg    
1135d7be9c72Smrg    Signed-off-by: Adam Jackson <ajax@redhat.com>
1136d7be9c72Smrg
1137a31a186aSmrgcommit df6014303b6933ae7c4bcbe00762180dfd692598
1138a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1139a31a186aSmrgDate:   Wed Mar 24 10:05:09 2010 -0400
1140a31a186aSmrg
1141a31a186aSmrg    Changed probe_size value to detect up to 16Megs of video ram on G200eV.
1142a31a186aSmrg
1143a31a186aSmrgcommit 3f215b64889bcc7a656fc36db1eed8276b401a95
1144a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1145a31a186aSmrgDate:   Thu Feb 11 11:37:36 2010 -0500
1146a31a186aSmrg
1147a31a186aSmrg    Added support for G200EH
1148a31a186aSmrg
1149a31a186aSmrgcommit 9993ea7479d15daf7cca5aad55d51acd8c19fee1
1150a31a186aSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
1151a31a186aSmrgDate:   Fri Jan 15 15:52:05 2010 -0800
1152a31a186aSmrg
1153a31a186aSmrg    Update Sun license notices to current X.Org standard form
1154a31a186aSmrg    
1155a31a186aSmrg    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
1156a31a186aSmrg
1157a31a186aSmrgcommit feed5306f48b8ebe4ed8be7d3ae63051ae972968
1158a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1159a31a186aSmrgDate:   Tue Dec 15 21:47:12 2009 -0500
1160a31a186aSmrg
1161a31a186aSmrg    configure.ac: use backticks rather than $() for cmd subs
1162a31a186aSmrg    
1163a31a186aSmrg    Use "$PKG_CONFIG" rather than hard coded "pkg-config"
1164a31a186aSmrg    
1165a31a186aSmrg    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
1166a31a186aSmrg    Acked-by: Daniel Stone <daniel@fooishbar.org>
1167a31a186aSmrg    
1168a31a186aSmrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1169a31a186aSmrg
1170a31a186aSmrgcommit 896e4e5a34ee20a289934f9fe42c888bd9bb140c
1171a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1172a31a186aSmrgDate:   Mon Nov 23 09:25:05 2009 -0500
1173a31a186aSmrg
1174a31a186aSmrg    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
1175a31a186aSmrg    
1176a31a186aSmrg    Now that the INSTALL file is generated.
1177a31a186aSmrg    Allows running make maintainer-clean.
1178a31a186aSmrg
1179a31a186aSmrgcommit f0c388a26db5f24b9c3846b73a12197483b440ca
1180a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1181a31a186aSmrgDate:   Wed Oct 28 14:41:41 2009 -0400
1182a31a186aSmrg
1183a31a186aSmrg    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
1184a31a186aSmrg    
1185a31a186aSmrg    Automake 'foreign' option is specified in configure.ac.
1186a31a186aSmrg    Remove from Makefile.am
1187a31a186aSmrg
1188a31a186aSmrgcommit cd8434d86de8507e23405282acf80a9d02313134
1189a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1190a31a186aSmrgDate:   Wed Oct 28 14:09:09 2009 -0400
1191a31a186aSmrg
1192a31a186aSmrg    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
1193a31a186aSmrg    
1194a31a186aSmrg    Add missing INSTALL file. Use standard GNU file on building tarball
1195a31a186aSmrg    README may have been updated
1196a31a186aSmrg    Remove AUTHORS file as it is empty and no content available yet.
1197a31a186aSmrg    Remove NEWS file as it is empty and no content available yet.
1198a31a186aSmrg
1199a31a186aSmrgcommit 2dc2cca0da1d007ea4bc962f2a298df98560268a
1200a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1201a31a186aSmrgDate:   Mon Oct 26 12:54:21 2009 -0400
1202a31a186aSmrg
1203a31a186aSmrg    Several driver modules do not have a ChangeLog target in Makefile.am #23814
1204a31a186aSmrg    
1205a31a186aSmrg    The git generated ChangeLog replaces the hand written one.
1206a31a186aSmrg    Update configure.ac to xorg-macros level 1.3.
1207a31a186aSmrg    Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
1208a31a186aSmrg    Update Makefile.am to add ChangeLog target if missing
1209a31a186aSmrg    Remove ChangeLog from EXTRA_DIST or *CLEAN variables
1210a31a186aSmrg    This is a pre-req for the INSTALL_CMD
1211a31a186aSmrg
1212a31a186aSmrgcommit 7315b5a5b377810b8e11daf6b16e619f47cbde40
1213a31a186aSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1214a31a186aSmrgDate:   Thu Oct 22 12:34:17 2009 -0400
1215a31a186aSmrg
1216a31a186aSmrg    .gitignore: use common defaults with custom section # 24239
1217a31a186aSmrg    
1218a31a186aSmrg    Using common defaults will reduce errors and maintenance.
1219a31a186aSmrg    Only the very small or inexistent custom section need periodic maintenance
1220a31a186aSmrg    when the structure of the component changes. Do not edit defaults.
1221a31a186aSmrg
1222a31a186aSmrgcommit 5d4144e6c2912292c3552a45e4a0a3c127cad013
1223a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1224a31a186aSmrgDate:   Tue Nov 10 09:21:24 2009 -0500
1225a31a186aSmrg
1226a31a186aSmrg    Removed DDC1 support for G200eW.
1227a31a186aSmrg
1228a31a186aSmrgcommit 860d42232f7fa18805334746e7e9415c4ae50aa3
1229a31a186aSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1230a31a186aSmrgDate:   Wed Aug 19 11:01:39 2009 -0400
1231a31a186aSmrg
1232a31a186aSmrg    updated G200eW PLL programming sequence.
1233a31a186aSmrg
1234a31a186aSmrgcommit 319bba2b759ec64287935e2fb16491f75a3169af
1235a31a186aSmrgAuthor: Dave Airlie <airlied@redhat.com>
1236a31a186aSmrgDate:   Thu Jul 30 12:04:28 2009 +1000
1237a31a186aSmrg
1238a31a186aSmrg    mga: bump for release 1.4.11
1239a31a186aSmrg
1240643b027fSmrgcommit e29477ef4d4ae50c39ef608ad0e2344c5c68ed40
1241643b027fSmrgAuthor: Dave Airlie <airlied@redhat.com>
1242643b027fSmrgDate:   Tue Jul 28 15:22:40 2009 +1000
1243643b027fSmrg
1244643b027fSmrg    mga: change to using ABI version check
1245643b027fSmrg
1246643b027fSmrgcommit 26ca92acc58b74202ec5eacaffc8e418d878da5e
1247643b027fSmrgAuthor: Dave Airlie <airlied@redhat.com>
1248643b027fSmrgDate:   Tue Jul 28 13:32:31 2009 +1000
1249643b027fSmrg
1250643b027fSmrg    mga: update for resources/RAC API removal
1251643b027fSmrg
1252643b027fSmrgcommit c1b8e89f367510958ffa8072ccbf416a13790c96
1253643b027fSmrgAuthor: Gaetan Nadon <memsize@videotron.ca>
1254643b027fSmrgDate:   Thu Jul 9 13:09:42 2009 -0400
1255643b027fSmrg
1256643b027fSmrg    xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611
1257643b027fSmrg    
1258643b027fSmrg    Adding the macro in configure.ac and use it in Makefile.am
1259643b027fSmrg    Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
1260643b027fSmrg    
1261643b027fSmrg    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1262643b027fSmrg    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1263643b027fSmrg
1264643b027fSmrgcommit 828b55d822f644976df40c8b835043895b7785e3
1265643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com>
1266643b027fSmrgDate:   Thu May 28 15:06:19 2009 -0400
1267643b027fSmrg
1268643b027fSmrg    Remove useless loader symbol lists.
1269643b027fSmrg
1270643b027fSmrgcommit afda628bf77d4c6d58de6f1b88a8fa5391f1df1a
1271643b027fSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
1272643b027fSmrgDate:   Mon May 11 22:20:56 2009 -0700
1273643b027fSmrg
1274643b027fSmrg    Fill in COPYING file, add SubmittingPatches URL to README
1275643b027fSmrg
1276643b027fSmrgcommit 2972b5707bbee5ac0d046b5100bcf572d82e1c4d
1277643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com>
1278643b027fSmrgDate:   Wed May 6 14:12:35 2009 -0400
1279643b027fSmrg
1280643b027fSmrg    Do E-EDID if built against a server that supports it.
1281643b027fSmrg
1282643b027fSmrgcommit b3fc1acaedd5d45b2c8eb2ba99b24579cf7d2a79
1283643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com>
1284643b027fSmrgDate:   Wed May 6 13:02:36 2009 -0400
1285643b027fSmrg
1286643b027fSmrg    Normalize DDC for the second head.
1287643b027fSmrg    
1288643b027fSmrg    The exit path wasn't symmetric with the exit path for the first head.
1289643b027fSmrg
1290643b027fSmrgcommit bf6aee62b891d4305cb96f8a37e625e5cf7c1504
1291643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com>
1292643b027fSmrgDate:   Wed May 6 12:04:48 2009 -0400
1293643b027fSmrg
1294643b027fSmrg    Remove redundant MGAuseI2C macro
1295643b027fSmrg
1296643b027fSmrgcommit 626af26098ab5d0823bf1d6c08157b4c89ec578a
1297643b027fSmrgAuthor: Adam Jackson <ajax@redhat.com>
1298643b027fSmrgDate:   Mon Apr 27 14:01:03 2009 -0400
1299643b027fSmrg
1300643b027fSmrg    mga 1.4.10
1301643b027fSmrg
1302eda3803bSmrgcommit d33b06038223b2b121be7e3f8c207de5f518b28c
1303eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1304eda3803bSmrgDate:   Mon Apr 27 14:00:00 2009 -0400
1305eda3803bSmrg
1306eda3803bSmrg    Fix ChangeLog generation
1307eda3803bSmrg
1308eda3803bSmrgcommit 06b6ead9a1b367e08ed6b3e75dfde0ee3b4a82b8
1309eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1310eda3803bSmrgDate:   Mon Apr 27 13:37:42 2009 -0400
1311eda3803bSmrg
1312eda3803bSmrg    G200SE: Only force 16bpp on low-memory cards
1313eda3803bSmrg
1314eda3803bSmrgcommit 8b84fe236a42336e87048317880cc437494655f1
1315eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1316eda3803bSmrgDate:   Mon Apr 27 13:36:45 2009 -0400
1317eda3803bSmrg
1318eda3803bSmrg    Move device ID and memory sizing much earlier in setup
1319eda3803bSmrg
1320eda3803bSmrgcommit 9a82c5db3f8332d10b31d68e5b86d3a6b136dc5e
1321eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1322eda3803bSmrgDate:   Mon Apr 27 13:26:03 2009 -0400
1323eda3803bSmrg
1324eda3803bSmrg    Fix xf86ModeBandwidth check
1325eda3803bSmrg
1326eda3803bSmrgcommit 58888aefd0bad7bfca231ec7a54865d9c26c8095
1327eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1328eda3803bSmrgDate:   Mon Apr 27 13:19:42 2009 -0400
1329eda3803bSmrg
1330eda3803bSmrg    Remove a leftover from overlay support
1331eda3803bSmrg
1332eda3803bSmrgcommit 19c44d537e982fcf0fe2dc9f3273ac6166302510
1333eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1334eda3803bSmrgDate:   Tue Apr 21 10:00:24 2009 -0400
1335eda3803bSmrg
1336eda3803bSmrg    Fixed bad vga access in memory count routine.
1337eda3803bSmrg
1338eda3803bSmrgcommit 2388c4d512554258bce2b78c8f8aa1151b161c3e
1339eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1340eda3803bSmrgDate:   Tue Apr 21 09:51:34 2009 -0400
1341eda3803bSmrg
1342eda3803bSmrg    Force pitch of 1024 for G200SE Pilot1 when edid is used as modeline.
1343eda3803bSmrg
1344eda3803bSmrgcommit 32bc0bcec815a363a47b9e7337d06370baf0c0d4
1345eda3803bSmrgAuthor: Stefan Dirsch <sndirsch@suse.de>
1346eda3803bSmrgDate:   Thu Apr 16 15:34:12 2009 +0200
1347eda3803bSmrg
1348eda3803bSmrg    Prevent MergedFB setups from crashing.
1349eda3803bSmrg    
1350eda3803bSmrg    Second time mga_read_and_process_bios() is called pMga->chip_attribs
1351eda3803bSmrg    is a NULL pointer for some reason. (#21022)
1352eda3803bSmrg
1353eda3803bSmrgcommit 70681daa0392e5fa413f888d92a30ddacdcc9c8c
1354eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1355eda3803bSmrgDate:   Tue Mar 31 11:41:00 2009 -0400
1356eda3803bSmrg
1357eda3803bSmrg    Fixed G200SE PLL selection routine of m,n,p.
1358eda3803bSmrg
1359eda3803bSmrgcommit c955c1fdabfe0449369d0ccf31ab7e6ef3d7bffe
1360eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1361eda3803bSmrgDate:   Mon Mar 30 13:38:39 2009 -0400
1362eda3803bSmrg
1363eda3803bSmrg    fixed memory count rountine for G200eW to detect up to 16Megs on X server without libpciaccess.
1364eda3803bSmrg
1365eda3803bSmrgcommit 16a5e3a7e13c0a2c1091ad452250cbc231b8f427
1366eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1367eda3803bSmrgDate:   Thu Mar 26 10:58:06 2009 -0400
1368eda3803bSmrg
1369eda3803bSmrg    Modified memory count rountine for G200eW to detect up to 16Megs.
1370eda3803bSmrg
1371eda3803bSmrgcommit 36ae47b82310d96f158694765105fc010911702f
1372eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1373eda3803bSmrgDate:   Wed Mar 11 16:31:43 2009 -0400
1374eda3803bSmrg
1375eda3803bSmrg    Fixed bad access issues and ddc1 implementation for IP core.
1376eda3803bSmrg    Fixed a bug in PLL programming sequence for G200eW/G200eV where a register IO offset was used instead of
1377eda3803bSmrg    a memory offset.
1378eda3803bSmrg    Removed clock selection toggling in PLL programming sequence for G200eW.
1379eda3803bSmrg    Fixed ddc1 protocol to support correct I/O lines according to chip attribute.
1380eda3803bSmrg    Fixed a bug in CRTC2 programming seqence where a register IO offset was used instead of a memory offset.
1381eda3803bSmrg
1382eda3803bSmrgcommit 669acb55023bce505f4a912bed6f1e9f3efa2856
1383eda3803bSmrgAuthor: Thomas Jaeger <ThJaeger@gmail.com>
1384eda3803bSmrgDate:   Fri Jan 30 16:18:34 2009 -0500
1385eda3803bSmrg
1386eda3803bSmrg    Fall back to software for unsupported repeat modes
1387eda3803bSmrg    
1388eda3803bSmrg    [anholt: dropped unneded ->repeat check -- it's a misguided compat field for
1389eda3803bSmrg    drivers from before repeatType existed]
1390eda3803bSmrg
1391eda3803bSmrgcommit 496342b09b7379bff95627ec357d4dd24123dc85
1392eda3803bSmrgAuthor: Chris Ball <cjb@laptop.org>
1393eda3803bSmrgDate:   Fri Feb 27 10:54:17 2009 -0500
1394eda3803bSmrg
1395eda3803bSmrg    Revert "Build fix for EXA 3"
1396eda3803bSmrg    
1397eda3803bSmrg    This reverts commit 4aac5618278d47a801bef40d3eede1c360c1ea28.
1398eda3803bSmrg    The EXA developers have backed out this ABI bump.
1399eda3803bSmrg    
1400eda3803bSmrg    Signed-off-by: Chris Ball <cjb@laptop.org>
1401eda3803bSmrg
1402eda3803bSmrgcommit 4aac5618278d47a801bef40d3eede1c360c1ea28
1403eda3803bSmrgAuthor: Chris Ball <cjb@laptop.org>
1404eda3803bSmrgDate:   Tue Feb 24 12:48:54 2009 -0500
1405eda3803bSmrg
1406eda3803bSmrg    Build fix for EXA 3
1407eda3803bSmrg    
1408eda3803bSmrg    EXA in xserver head now requires us to pass -DEXA_DRIVER_KNOWN_MAJOR=3.
1409eda3803bSmrg    
1410eda3803bSmrg    Signed-off-by: Chris Ball <cjb@laptop.org>
1411eda3803bSmrg
1412eda3803bSmrgcommit 0e9df5fe820d69387355c3ef857cde4cc72220b0
1413eda3803bSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
1414eda3803bSmrgDate:   Fri Jan 30 20:41:56 2009 -0800
1415eda3803bSmrg
1416eda3803bSmrg    Add README with pointers to mailing list, bugzilla & git repos
1417eda3803bSmrg
1418eda3803bSmrgcommit aa64a0c7b31858802f953b787991ef9c22a94cc5
1419eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1420eda3803bSmrgDate:   Wed Jan 21 09:56:41 2009 -0500
1421eda3803bSmrg
1422eda3803bSmrg    Updated PLL algorithm for G200eW.
1423eda3803bSmrg    Changed the m,n,p selection for G200eW and programming sequence.
1424eda3803bSmrg
1425eda3803bSmrgcommit 808d887d910636aaa64c42d6add896e9f9b1833a
1426eda3803bSmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
1427eda3803bSmrgDate:   Fri Jan 9 16:30:43 2009 -0800
1428eda3803bSmrg
1429eda3803bSmrg    Remove xorgconfig & xorgcfg from See Also list in man page
1430eda3803bSmrg
1431eda3803bSmrgcommit ba376973ae0d25557fdcd920e03474c0e6632e97
1432eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1433eda3803bSmrgDate:   Thu Nov 20 23:02:49 2008 -0500
1434eda3803bSmrg
1435eda3803bSmrg    Fixed PLL m,n,p selection for G200eW to respect byte granularity.
1436eda3803bSmrg    Renamed G200 eW Winbond ID string to Nuvoton.
1437eda3803bSmrg    Added EV suffix to G200 Maxim.
1438eda3803bSmrg    Blocked double scan mode for G200 eW.
1439eda3803bSmrg    Fixed memory bandwidth limitation for G200eW to 318.77 Mhz.
1440eda3803bSmrg    Added a workaround (blit 1x1 with rop=xor) to fix the black screen problem for G200eW.
1441eda3803bSmrg
1442eda3803bSmrgcommit 01e60b391f39f2ebcf2eeb3be2424a2e291ec8ca
1443eda3803bSmrgAuthor: Yannick Heneault <yheneaul@matrox.com>
1444eda3803bSmrgDate:   Wed Oct 1 21:39:40 2008 -0400
1445eda3803bSmrg
1446eda3803bSmrg    fixed winbond/nuvoton min pll clock to correct value (18.75Mhz).
1447eda3803bSmrg
1448eda3803bSmrgcommit a0ebccaa10668bff6a51d9c027cd43e29a030e2b
1449eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1450eda3803bSmrgDate:   Wed Jul 2 15:02:32 2008 -0400
1451eda3803bSmrg
1452eda3803bSmrg    mga 1.4.9
1453eda3803bSmrg
1454eda3803bSmrgcommit 62c8f0ad5bb3dd23226a6b481ed4f260c6770f55
1455eda3803bSmrgAuthor: Yannick Henault <yheneaul@matrox.com>
1456eda3803bSmrgDate:   Mon Jun 30 17:00:16 2008 -0400
1457eda3803bSmrg
1458eda3803bSmrg    Bug #16545: Add G200WB support.
1459eda3803bSmrg
1460eda3803bSmrgcommit 32d50fca615af2c49914dd88c9da0f21b868b172
1461eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1462eda3803bSmrgDate:   Mon Jun 23 13:06:21 2008 -0400
1463eda3803bSmrg
1464eda3803bSmrg    Death to RCS tags.
1465eda3803bSmrg
1466eda3803bSmrgcommit 382659741681ad10290c1e01045dfe9e2fde8d3f
1467eda3803bSmrgAuthor: Yannick Henault <yheneaul@matrox.com>
1468eda3803bSmrgDate:   Mon Jun 23 13:02:43 2008 -0400
1469eda3803bSmrg
1470eda3803bSmrg    Bug #15836: Fix DDC on G200SE.
1471eda3803bSmrg
1472eda3803bSmrgcommit 9e2ee9403c198da5d79dfb2f4fcafe9b381afd3d
1473eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1474eda3803bSmrgDate:   Mon Jun 9 11:36:46 2008 -0700
1475eda3803bSmrg
1476eda3803bSmrg    G200EV: Enable support for G200EV
1477eda3803bSmrg
1478eda3803bSmrgcommit fd9732800687b96caa9f81c0cc4b24c6aad04e78
1479eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1480eda3803bSmrgDate:   Fri May 30 19:47:10 2008 -0700
1481eda3803bSmrg
1482eda3803bSmrg    I2C: Second (and final) round of clean-ups
1483eda3803bSmrg
1484eda3803bSmrgcommit c0711038ac2dcfb28dd4ead784c89615fb3b5844
1485eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1486eda3803bSmrgDate:   Fri May 30 19:39:38 2008 -0700
1487eda3803bSmrg
1488eda3803bSmrg    I2C: First round of clean-ups
1489eda3803bSmrg
1490eda3803bSmrgcommit 7e28ce7f26fba2acee879c1da41426490034c0a9
1491eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1492eda3803bSmrgDate:   Fri May 30 18:43:27 2008 -0700
1493eda3803bSmrg
1494eda3803bSmrg    Get memory probe size and stride (offset) values values from a data table instead of from code
1495eda3803bSmrg
1496eda3803bSmrgcommit 074a4aa1985219910a96b022368067e3ed5641e6
1497eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1498eda3803bSmrgDate:   Fri May 30 18:23:59 2008 -0700
1499eda3803bSmrg
1500eda3803bSmrg    Initialize default BIOS values from a data table instead of from code
1501eda3803bSmrg
1502eda3803bSmrgcommit 9ee7b04b1fe57834a541ef27b4e25acffd3ac1c5
1503eda3803bSmrgAuthor: Ian Romanick <idr@us.ibm.com>
1504eda3803bSmrgDate:   Fri May 30 17:51:22 2008 -0700
1505eda3803bSmrg
1506eda3803bSmrg    cfb8_32: Gut a remnants of support for 24-bit with 8-bit overlay
1507eda3803bSmrg
1508eda3803bSmrgcommit 254299d06eba2ede820f1fe2929a4b247ead39b1
1509eda3803bSmrgAuthor: Tiago Vignatti <vignatti@c3sl.ufpr.br>
1510eda3803bSmrgDate:   Wed May 7 01:07:44 2008 -0300
1511eda3803bSmrg
1512eda3803bSmrg    For compatibility, accept SWcursor as option.
1513eda3803bSmrg
1514eda3803bSmrgcommit 0c61ccde7857dc7514881636144f95df51edaddf
1515eda3803bSmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
1516eda3803bSmrgDate:   Fri Feb 1 00:15:27 2008 -0200
1517eda3803bSmrg
1518eda3803bSmrg    Replace ALLOCATE_LOCAL/DEALLOCATE_LOCAL with xalloc/xfree.
1519eda3803bSmrg    
1520eda3803bSmrg    The other missing symbols is MGAGetClientPointer, that I believe
1521eda3803bSmrg    should be provided by matrox's libHAL.a, that I am afraid if someone
1522eda3803bSmrg    still has a copy of it, it won't work with X Org's loader.
1523eda3803bSmrg
1524eda3803bSmrgcommit dcad316efe93491fabfe558bcf5331cf0a9402a6
1525eda3803bSmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr>
1526eda3803bSmrgDate:   Sat Mar 8 23:39:28 2008 +0100
1527eda3803bSmrg
1528eda3803bSmrg    Makefile.am: nuke RCS Id
1529eda3803bSmrg
1530eda3803bSmrgcommit b5e43552f6b2a8ce8f405411a4ba6496e57d5100
1531eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1532eda3803bSmrgDate:   Sat Jan 19 15:34:56 2008 -0500
1533eda3803bSmrg
1534eda3803bSmrg    Disable I2C on G200SE for now.
1535eda3803bSmrg
1536eda3803bSmrgcommit cd2436c57d6b197ce0f58bf39ade903393cea842
1537eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1538eda3803bSmrgDate:   Sat Jan 19 15:34:41 2008 -0500
1539eda3803bSmrg
1540eda3803bSmrg    Change initial memory sizing on G200SE.
1541eda3803bSmrg
1542eda3803bSmrgcommit 40a4c1bdff174c31e6426a2ab3bc7cea5d99a700
1543eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1544eda3803bSmrgDate:   Sat Jan 19 15:34:19 2008 -0500
1545eda3803bSmrg
1546eda3803bSmrg    Adjust memory timings on G200SE-A.
1547eda3803bSmrg    
1548eda3803bSmrg    A bit opaque, but from the vendor:
1549eda3803bSmrg    
1550eda3803bSmrg    "The 0x1E24 check is to verify which pilot card is being used. And is used
1551eda3803bSmrg    mainly to setup the hipri value of the card for use in a non hal enabled
1552eda3803bSmrg    configuration as well as for when we check the max bandwidth for the latest
1553eda3803bSmrg    board version of pilot." (fdo bug #11652)
1554eda3803bSmrg
1555eda3803bSmrgcommit d26b8d50a80b9408565f7daf0ad911bac5f44721
1556eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1557eda3803bSmrgDate:   Sat Jan 19 15:33:49 2008 -0500
1558eda3803bSmrg
1559eda3803bSmrg    Updates to memory sizing on G200SE.
1560eda3803bSmrg
1561eda3803bSmrgcommit e3777cafc07500c733b8569b50ce202e346c94bf
1562eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1563eda3803bSmrgDate:   Sat Jan 19 15:33:28 2008 -0500
1564eda3803bSmrg
1565eda3803bSmrg    No depth 15 on G200SE-A.
1566eda3803bSmrg
1567eda3803bSmrgcommit 6cd7677c41cf59194561225ed521a295e535862f
1568eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1569eda3803bSmrgDate:   Sat Jan 19 15:33:13 2008 -0500
1570eda3803bSmrg
1571eda3803bSmrg    Filter high-bandwidth modes on G200SE.
1572eda3803bSmrg
1573eda3803bSmrgcommit 15ba6d7b79308ff2da8abc9edf67ddc96d7d6b9f
1574eda3803bSmrgAuthor: Adam Jackson <ajax@redhat.com>
1575eda3803bSmrgDate:   Sat Jan 19 15:32:53 2008 -0500
1576eda3803bSmrg
1577eda3803bSmrg    Update PInS defaults for G200SE-A.
1578eda3803bSmrg
1579fe5e51b7Smrgcommit e50a99877b2870746266b799b0a6411b2214a3de
1580fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1581fe5e51b7SmrgDate:   Fri Jan 18 19:31:40 2008 +0100
1582fe5e51b7Smrg
1583fe5e51b7Smrg    Bumped version to 1.4.8.
1584fe5e51b7Smrg
1585fe5e51b7Smrgcommit bfee7bf011625079fd79b1bf89198ffeb76096d2
1586fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1587fe5e51b7SmrgDate:   Fri Jan 18 18:05:49 2008 +0100
1588fe5e51b7Smrg
1589fe5e51b7Smrg    Bug #13926: Unbreak Xinerama.
1590fe5e51b7Smrg
1591fe5e51b7Smrgcommit 2096022c0757b675d39dea8830125ba800b43160
1592fe5e51b7SmrgAuthor: Adam Jackson <ajax@redhat.com>
1593fe5e51b7SmrgDate:   Wed Dec 12 18:10:52 2007 -0500
1594fe5e51b7Smrg
1595fe5e51b7Smrg    G200SE-A can't cope with bigger than 1600x1200.
1596fe5e51b7Smrg
1597fe5e51b7Smrgcommit 81717e5780350665166dd7a0f4d96135609a8764
1598fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
1599fe5e51b7SmrgDate:   Tue Oct 30 18:43:30 2007 -0700
1600fe5e51b7Smrg
1601fe5e51b7Smrg    Don't build or call init_dri if XF86DRI is undefined
1602fe5e51b7Smrg
1603fe5e51b7Smrgcommit db22b6ef0fa3ae20f46719bd826e16b6580e5213
1604fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1605fe5e51b7SmrgDate:   Wed Oct 3 23:06:48 2007 +0200
1606fe5e51b7Smrg
1607fe5e51b7Smrg    Fixed a typo.
1608fe5e51b7Smrg
1609fe5e51b7Smrgcommit 8e971287f60f3a41f2d0d176e4eaaa653e25276b
1610fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1611fe5e51b7SmrgDate:   Wed Oct 3 12:47:59 2007 -0700
1612fe5e51b7Smrg
1613fe5e51b7Smrg    Unmap the same size that was mapped
1614fe5e51b7Smrg    
1615fe5e51b7Smrg    Make sure the same size is used with pci_device_unmap_range as was used with
1616fe5e51b7Smrg    pci_device_map_range.  Failing to do so was causing problems with a G450
1617fe5e51b7Smrg    card in a POWER6 box.
1618fe5e51b7Smrg    
1619fe5e51b7Smrg    Based on a patch submitted by Anton Blanchard.
1620fe5e51b7Smrg
1621fe5e51b7Smrgcommit 10d452ad86b4798f3ded6c4c2446f08aaab6af00
1622fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1623fe5e51b7SmrgDate:   Sat Sep 15 00:16:16 2007 +0200
1624fe5e51b7Smrg
1625fe5e51b7Smrg    Oops, don't access the "memory" field in struct pci_mem_region either.
1626fe5e51b7Smrg
1627fe5e51b7Smrgcommit 485fb9aa1e5d90c75d763db4b7bf5a80e51e83e9
1628fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1629fe5e51b7SmrgDate:   Fri Sep 14 23:10:09 2007 +0200
1630fe5e51b7Smrg
1631fe5e51b7Smrg    Use pci_device_map_range() instead of pci_device_map_region().
1632fe5e51b7Smrg    
1633fe5e51b7Smrg    Likewise for pci_device_unmap_region().
1634fe5e51b7Smrg
1635fe5e51b7Smrgcommit d7f0f657504b2646a94f652baf0f71ff4117fac4
1636fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1637fe5e51b7SmrgDate:   Wed Sep 5 18:06:57 2007 +0200
1638fe5e51b7Smrg
1639fe5e51b7Smrg    Bumped version to 1.4.7.
1640fe5e51b7Smrg
1641fe5e51b7Smrgcommit 6fde3fd6d34e7252ee16422b19896d71b1622039
1642a31a186aSmrgMerge: 4bfc1e1 923176f
1643fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com>
1644fe5e51b7SmrgDate:   Mon Sep 3 06:07:32 2007 -0400
1645fe5e51b7Smrg
1646fe5e51b7Smrg    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga
1647fe5e51b7Smrg
1648fe5e51b7Smrgcommit 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3
1649fe5e51b7SmrgAuthor: James Cloos <cloos@jhcloos.com>
1650fe5e51b7SmrgDate:   Mon Sep 3 05:52:35 2007 -0400
1651fe5e51b7Smrg
1652fe5e51b7Smrg    Add *~ to .gitignore to skip patch/emacs droppings
1653fe5e51b7Smrg
1654fe5e51b7Smrgcommit 923176f5aad777b4023003a457bb77da21373389
1655fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1656fe5e51b7SmrgDate:   Fri Aug 31 11:05:57 2007 -0700
1657fe5e51b7Smrg
1658fe5e51b7Smrg    Use XSERVER_LIBPCIACCESS to detect pci-rework.
1659fe5e51b7Smrg
1660fe5e51b7Smrgcommit 90beb8c27b4206b593898d346bf37ab49e75b975
1661fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1662fe5e51b7SmrgDate:   Wed Aug 22 11:19:46 2007 -0700
1663fe5e51b7Smrg
1664fe5e51b7Smrg    Set pScrn to NULL before calling xf86ConfigPciEntity.
1665fe5e51b7Smrg    
1666fe5e51b7Smrg    Why is the interface to xf86ConfigPciEntity so filled with hate?
1667fe5e51b7Smrg
1668fe5e51b7Smrgcommit 55d219394ad6af8e25ff604bcbb49d5a551bd348
1669fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1670fe5e51b7SmrgDate:   Wed Aug 22 10:43:39 2007 -0700
1671fe5e51b7Smrg
1672fe5e51b7Smrg    Merge PCI-rework support and "classic" PCI interface support into one tree
1673fe5e51b7Smrg    
1674fe5e51b7Smrg    First pass at merging both trees.  So far, this has only been tested
1675fe5e51b7Smrg    on the PCI-rework build on a PCI G450.
1676fe5e51b7Smrg
1677fe5e51b7Smrgcommit f4ef39d53d5a67942707507814fef4ad466dc909
1678fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1679fe5e51b7SmrgDate:   Mon Aug 20 15:36:57 2007 -0700
1680fe5e51b7Smrg
1681fe5e51b7Smrg    Fix compile error introduced by merge.
1682fe5e51b7Smrg
1683fe5e51b7Smrgcommit 707d3adbc7d9ee918d6c70083f51ad851ce68852
1684a31a186aSmrgMerge: 741c50c 489e007
1685fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1686fe5e51b7SmrgDate:   Mon Aug 20 15:20:39 2007 -0700
1687fe5e51b7Smrg
1688fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
1689fe5e51b7Smrg
1690fe5e51b7Smrgcommit 489e007a29de63716ab550eacb3e98a91975d1d5
1691fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1692fe5e51b7SmrgDate:   Wed Aug 8 21:32:57 2007 +0200
1693fe5e51b7Smrg
1694fe5e51b7Smrg    Fixed major blending and compositing breakage.
1695fe5e51b7Smrg    
1696fe5e51b7Smrg    Do not adjust the destination blend factor if we need source alpha
1697fe5e51b7Smrg    but our source doesn't have an alpha channel. This makes no sense at all,
1698fe5e51b7Smrg    because the intermediate picture will always have alpha bits (either from
1699fe5e51b7Smrg    the original source, or forced to 0xff).
1700fe5e51b7Smrg
1701fe5e51b7Smrgcommit 3820f55e3068163f8c3047a25126673e6de2d16e
1702fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1703fe5e51b7SmrgDate:   Wed Aug 1 09:02:21 2007 -0700
1704fe5e51b7Smrg
1705fe5e51b7Smrg    Add info for offset 116 in PInS version 5.
1706fe5e51b7Smrg
1707fe5e51b7Smrgcommit 7d7626f8429e108dd326899d927de4b4c79f71f5
1708fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1709fe5e51b7SmrgDate:   Mon Jul 30 12:36:19 2007 +0200
1710fe5e51b7Smrg
1711fe5e51b7Smrg    Bug #4249: Further increase the minimum dot clock.
1712fe5e51b7Smrg
1713fe5e51b7Smrgcommit 1a1fe837bc114b5f741e87f14bef74803e299c8d
1714fe5e51b7SmrgAuthor: Brice Goglin <Brice.Goglin@ens-lyon.org>
1715fe5e51b7SmrgDate:   Fri Jul 27 18:19:21 2007 +0200
1716fe5e51b7Smrg
1717fe5e51b7Smrg    Change minimal frequency guess from 12 to 16MHz
1718fe5e51b7Smrg    
1719fe5e51b7Smrg    G550 seems to lock up with frequencies below 16MHz.
1720fe5e51b7Smrg    
1721fe5e51b7Smrg    Reported by Benjamin Wong <hackerb9@u.washington.edu> in
1722fe5e51b7Smrg    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430112
1723fe5e51b7Smrg    and https://bugs.freedesktop.org/show_bug.cgi?id=11339
1724fe5e51b7Smrg
1725fe5e51b7Smrgcommit 041caa230b91a017881394c59d76d663d647529c
1726fe5e51b7SmrgAuthor: Gabriele Gorla <gorlik@yahoo.com>
1727fe5e51b7SmrgDate:   Thu Jul 19 22:14:51 2007 -0400
1728fe5e51b7Smrg
1729fe5e51b7Smrg    Add Xv support for Millennium II chips
1730fe5e51b7Smrg    
1731fe5e51b7Smrg    Bug 11537
1732fe5e51b7Smrg
1733fe5e51b7Smrgcommit 7b080d993ceda7b181e0611ed0c997c8aecc9ad7
1734fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1735fe5e51b7SmrgDate:   Sun Apr 15 12:47:27 2007 +0200
1736fe5e51b7Smrg
1737fe5e51b7Smrg    Added memcpy-based DownloadFromScreen implementation.
1738fe5e51b7Smrg
1739fe5e51b7Smrgcommit 43b79af51b600e98ecac9d57aeb0d686dbc6a50e
1740fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1741fe5e51b7SmrgDate:   Sun Apr 15 12:41:01 2007 +0200
1742fe5e51b7Smrg
1743fe5e51b7Smrg    On G550, do A8 adds in hardware.
1744fe5e51b7Smrg
1745fe5e51b7Smrgcommit 69c4ed205afbeb9ad937f079caace6cee19bd7b1
1746fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1747fe5e51b7SmrgDate:   Sun Apr 15 12:28:28 2007 +0200
1748fe5e51b7Smrg
1749fe5e51b7Smrg    Make DRI initialization work when using EXA.
1750fe5e51b7Smrg    
1751fe5e51b7Smrg    Still need to implement InitBuffers and MoveBuffers for EXA.
1752fe5e51b7Smrg
1753fe5e51b7Smrgcommit 920b84364a374ac8cde9314efc6742c11a72ce4f
1754fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1755fe5e51b7SmrgDate:   Fri Mar 30 20:47:14 2007 +0200
1756fe5e51b7Smrg
1757fe5e51b7Smrg    Removed the debug messages for solid and copy ops.
1758fe5e51b7Smrg
1759fe5e51b7Smrgcommit d1696d91d9da79c40b0576b3ce754dc8a6666117
1760fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1761fe5e51b7SmrgDate:   Fri Mar 30 20:45:45 2007 +0200
1762fe5e51b7Smrg
1763fe5e51b7Smrg    Sync after UploadToScreen.
1764fe5e51b7Smrg
1765fe5e51b7Smrgcommit 1246f724bfdd44b49091516bf909ecf97c9b82db
1766fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net>
1767fe5e51b7SmrgDate:   Wed Mar 28 11:14:24 2007 -0400
1768fe5e51b7Smrg
1769fe5e51b7Smrg    Default mode on G200SE of 1024x768 @ 16bpp.
1770fe5e51b7Smrg    
1771fe5e51b7Smrg    The poor thing has so little VRAM that you can't do any bigger than 640x480
1772fe5e51b7Smrg    at 32bpp, so in the interest of having a reasonable screen size...
1773fe5e51b7Smrg
1774fe5e51b7Smrgcommit 834bdfc2503f64d8f3bff088dc5eaf8f52f828f5
1775fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net>
1776fe5e51b7SmrgDate:   Wed Mar 28 11:09:56 2007 -0400
1777fe5e51b7Smrg
1778fe5e51b7Smrg    Disable MTRR support for PCIE G200SE cards, as it tickles hardware bugs.
1779fe5e51b7Smrg
1780fe5e51b7Smrgcommit 630390dc5b892941ed6609ca5c35b90be53333f7
1781fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net>
1782fe5e51b7SmrgDate:   Wed Mar 28 11:07:49 2007 -0400
1783fe5e51b7Smrg
1784fe5e51b7Smrg    Fix various timing bugs on the G200SE.
1785fe5e51b7Smrg
1786fe5e51b7Smrgcommit 99430f1cf36c07350cdc557dbbb5c0a34c9b9dd0
1787fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1788fe5e51b7SmrgDate:   Sun Mar 18 12:41:06 2007 +0100
1789fe5e51b7Smrg
1790fe5e51b7Smrg    Shut up the compiler.
1791fe5e51b7Smrg
1792fe5e51b7Smrgcommit 741c50c162986a14647301c2c5f8e080a7664efd
1793fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1794fe5e51b7SmrgDate:   Fri Feb 2 15:50:14 2007 -0800
1795fe5e51b7Smrg
1796fe5e51b7Smrg    Code refactoring in MGAScreenInit.
1797fe5e51b7Smrg    
1798fe5e51b7Smrg    Rearrange code so that functions that are selected based on MergedFB
1799fe5e51b7Smrg    and SecondCrtc are selected in one place instead of 3.  Rearrange some
1800fe5e51b7Smrg    code that selects on FBDev and Primary to flow a little better.
1801fe5e51b7Smrg
1802fe5e51b7Smrgcommit 4432091b2597cf4bba09009622d247c0d8ff151f
1803fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1804fe5e51b7SmrgDate:   Thu Feb 1 13:45:18 2007 -0800
1805fe5e51b7Smrg
1806fe5e51b7Smrg    Ensure the result of MGAMapMem is checked.
1807fe5e51b7Smrg    
1808fe5e51b7Smrg    Add GCC warn_unused_result attribute to MGAMapMem.  Add a check of the
1809fe5e51b7Smrg    return value to one place that was missing it (in MGACountRam), and
1810fe5e51b7Smrg    check the return of that function.
1811fe5e51b7Smrg
1812fe5e51b7Smrgcommit 3a47132af4dfab420e3c35d7d100dd93fb7bf9c6
1813fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1814fe5e51b7SmrgDate:   Thu Feb 1 13:30:34 2007 -0800
1815fe5e51b7Smrg
1816fe5e51b7Smrg    Refactor memory map / unmap functions.
1817fe5e51b7Smrg    
1818fe5e51b7Smrg    MGAMapMem and MGAMapMemFBDev were refactored into a single function.
1819fe5e51b7Smrg    This happens to fix a bug triggered in software XAA paths because
1820fe5e51b7Smrg    MGAMapMem did not set FbStart.  MGAUnmapMem and MGAUnmapMemFBDev were
1821fe5e51b7Smrg    also refactored into a single function.
1822fe5e51b7Smrg
1823fe5e51b7Smrgcommit 916d41bcf99bbf666bf634edb1c72b90d9b16ea0
1824fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1825fe5e51b7SmrgDate:   Mon Jan 15 11:42:52 2007 -0800
1826fe5e51b7Smrg
1827fe5e51b7Smrg    Convert to new pci_device_cfg_write_u* interface.
1828fe5e51b7Smrg
1829fe5e51b7Smrgcommit b26bfefb7ea107be3949daea0f6beca6d80c09d4
1830fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1831fe5e51b7SmrgDate:   Mon Jan 15 11:42:07 2007 -0800
1832fe5e51b7Smrg
1833fe5e51b7Smrg    Pass the correct pointer to pci_device_cfg_write_bits.
1834fe5e51b7Smrg
1835fe5e51b7Smrgcommit d5b4dbe749e860e4349607c57467f8085dc28c33
1836a31a186aSmrgMerge: cb103a1 876657e
1837fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1838fe5e51b7SmrgDate:   Tue Jan 9 16:04:06 2007 -0800
1839fe5e51b7Smrg
1840fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
1841fe5e51b7Smrg
1842fe5e51b7Smrgcommit 876657e613de6d9dd906c95e05fc590a84d1c322
1843fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1844fe5e51b7SmrgDate:   Tue Dec 26 22:14:57 2006 +0100
1845fe5e51b7Smrg
1846fe5e51b7Smrg    Fixed a typo that caused MGAREG_C2OFFSET to be set to a bad value.
1847fe5e51b7Smrg    
1848fe5e51b7Smrg    Unfortunately, this doesn't fix any bugs because afterwards,
1849fe5e51b7Smrg    the correct value would be stored in MGAREG_C2OFFSET anyway.
1850fe5e51b7Smrg
1851fe5e51b7Smrgcommit 7d676a830a9b0c5593e144e15a14dc4aa6bc5ab7
1852fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1853fe5e51b7SmrgDate:   Tue Dec 26 19:45:18 2006 +0100
1854fe5e51b7Smrg
1855fe5e51b7Smrg    More boring janitoring work.
1856fe5e51b7Smrg
1857fe5e51b7Smrgcommit 787284f420d324821ac31b43f3d915d58533a141
1858fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1859fe5e51b7SmrgDate:   Tue Dec 26 00:30:51 2006 +0100
1860fe5e51b7Smrg
1861fe5e51b7Smrg    Fixed a typo in a debug message.
1862fe5e51b7Smrg
1863fe5e51b7Smrgcommit 373bf108414cebdaea8d3febc9120566ef5e4118
1864fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1865fe5e51b7SmrgDate:   Tue Dec 26 00:28:55 2006 +0100
1866fe5e51b7Smrg
1867fe5e51b7Smrg    Bug #9448: Actually write the C2STARTADD0 register.
1868fe5e51b7Smrg
1869fe5e51b7Smrgcommit fd91b601ec4dd48cfb6ea5495b595fec6d932ab5
1870a31a186aSmrgMerge: f84b138 0ce8f52
1871fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1872fe5e51b7SmrgDate:   Sun Dec 24 06:32:53 2006 +0200
1873fe5e51b7Smrg
1874fe5e51b7Smrg    Merge branch 'temp'
1875fe5e51b7Smrg
1876fe5e51b7Smrgcommit 0ce8f522a207dd0fa21ebf41b82f6af930cd7e54
1877fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1878fe5e51b7SmrgDate:   Sun Dec 24 06:24:56 2006 +0200
1879fe5e51b7Smrg
1880fe5e51b7Smrg    bump to 1.4.6.1 (respin)
1881fe5e51b7Smrg    No code changes, just built with a better util-macros.
1882fe5e51b7Smrg
1883fe5e51b7Smrgcommit 74d21b74774c81d3d96ff3017763c25e3660dde0
1884fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1885fe5e51b7SmrgDate:   Sun Dec 24 06:23:43 2006 +0200
1886fe5e51b7Smrg
1887fe5e51b7Smrg    bump to 1.4.6
1888fe5e51b7Smrg
1889fe5e51b7Smrgcommit f84b13871114e6bb486402e00186a319df123f53
1890fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1891fe5e51b7SmrgDate:   Sun Dec 24 06:23:19 2006 +0200
1892fe5e51b7Smrg
1893fe5e51b7Smrg    bump to 1.4.6.1
1894fe5e51b7Smrg
1895fe5e51b7Smrgcommit 9b2e1381ccda8bb4f4d186c20d5672738adfc04b
1896fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1897fe5e51b7SmrgDate:   Sat Dec 16 01:44:49 2006 +0200
1898fe5e51b7Smrg
1899fe5e51b7Smrg    bump to 1.4.6
1900fe5e51b7Smrg
1901fe5e51b7Smrgcommit cb103a18067adb3256c0b791255ce8435ff57e06
1902a31a186aSmrgMerge: d0e0362 4bcfca9
1903fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1904fe5e51b7SmrgDate:   Mon Dec 11 15:06:19 2006 -0800
1905fe5e51b7Smrg
1906fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
1907fe5e51b7Smrg
1908fe5e51b7Smrgcommit d0e03622811fd94c830c0b5233ff505392c0d331
1909a31a186aSmrgMerge: 8fee907 1dd6e69
1910fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
1911fe5e51b7SmrgDate:   Mon Dec 11 15:06:03 2006 -0800
1912fe5e51b7Smrg
1913fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
1914fe5e51b7Smrg    
1915fe5e51b7Smrg    Conflicts:
1916fe5e51b7Smrg    
19171e423a8fSmrg            src/mga_macros.h
1918fe5e51b7Smrg
1919fe5e51b7Smrgcommit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412
1920fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1921fe5e51b7SmrgDate:   Sun Dec 10 14:33:10 2006 +0100
1922fe5e51b7Smrg
1923fe5e51b7Smrg    Replaced some more magic values with register names.
1924fe5e51b7Smrg
1925fe5e51b7Smrgcommit 55d283a8c2347e809dadace3fb9a026bab6d57dd
1926fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1927fe5e51b7SmrgDate:   Wed Dec 6 18:46:00 2006 +0200
1928fe5e51b7Smrg
1929fe5e51b7Smrg    Makefile.am: fix ChangeLog hook
1930fe5e51b7Smrg    Make ChangeLog hook safe for all situations I could think of, including
1931fe5e51b7Smrg    carrying the ChangeLog through for distcheck when objdir != srcdir.  It's
1932fe5e51b7Smrg    significantly more ugly, but eh.
1933fe5e51b7Smrg
1934fe5e51b7Smrgcommit fbbbb853041ae4af36eeffb24188b9a5513ba7d5
1935fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1936fe5e51b7SmrgDate:   Sat Dec 2 12:42:34 2006 +0100
1937fe5e51b7Smrg
1938fe5e51b7Smrg    Removed a duplicated register definition.
1939fe5e51b7Smrg
1940fe5e51b7Smrgcommit 447aae84d07cab34987ab08ead9319e176ccd904
1941fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1942fe5e51b7SmrgDate:   Fri Dec 1 20:19:13 2006 +0100
1943fe5e51b7Smrg
1944fe5e51b7Smrg    More janitoring work.
1945fe5e51b7Smrg    
1946fe5e51b7Smrg    Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions
1947fe5e51b7Smrg    to mga_reg.h.
1948fe5e51b7Smrg    Cleaned up the DAC2 routing.
1949fe5e51b7Smrg
1950fe5e51b7Smrgcommit 10b2202c254b71b8d0da987a225d5e78a030bca4
1951fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1952fe5e51b7SmrgDate:   Fri Dec 1 19:10:55 2006 +0100
1953fe5e51b7Smrg
1954fe5e51b7Smrg    Use the XORG_RELEASE_VERSION autoconf macro.
1955fe5e51b7Smrg
1956fe5e51b7Smrgcommit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a
1957fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
1958fe5e51b7SmrgDate:   Thu Nov 30 19:59:38 2006 +0200
1959fe5e51b7Smrg
1960fe5e51b7Smrg    bump to 1.4.5
1961fe5e51b7Smrg
1962fe5e51b7Smrgcommit 5bbafd77678a2b0f82e820aa98337a014d284554
1963fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1964fe5e51b7SmrgDate:   Sun Nov 26 18:06:12 2006 +0100
1965fe5e51b7Smrg
1966fe5e51b7Smrg    Made some XAA function static.
1967fe5e51b7Smrg
1968fe5e51b7Smrgcommit 4778901bb13a950285c55ea6f058e94ee7b03652
1969fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1970fe5e51b7SmrgDate:   Sun Nov 26 16:21:34 2006 +0100
1971fe5e51b7Smrg
1972fe5e51b7Smrg    Removed a duplicated register definition.
1973fe5e51b7Smrg
1974fe5e51b7Smrgcommit f9d83ad601c8cba197e96f0b907f1dae6134953b
1975fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1976fe5e51b7SmrgDate:   Sun Nov 26 16:17:12 2006 +0100
1977fe5e51b7Smrg
1978fe5e51b7Smrg    Replaced more magic values with register names.
1979fe5e51b7Smrg
1980fe5e51b7Smrgcommit 6df85941ce077e1eee8b43945c51ab1b0906c758
1981fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1982fe5e51b7SmrgDate:   Sun Nov 26 15:39:54 2006 +0100
1983fe5e51b7Smrg
1984fe5e51b7Smrg    Use register names in MGASaveScreenMerged() rather than magic numbers.
1985fe5e51b7Smrg
1986fe5e51b7Smrgcommit b3ee69f6ac058e52d5175f611090baa76eed49f9
1987fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1988fe5e51b7SmrgDate:   Sun Nov 26 15:24:46 2006 +0100
1989fe5e51b7Smrg
1990fe5e51b7Smrg    Register name tweak.
1991fe5e51b7Smrg    
1992fe5e51b7Smrg    The "DAC power down" register powers down the DAC when it's
1993fe5e51b7Smrg    set to zero, and enables it when it's set to one.
1994fe5e51b7Smrg    To avoid confusion, I renamed it.
1995fe5e51b7Smrg
1996fe5e51b7Smrgcommit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528
1997fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
1998fe5e51b7SmrgDate:   Sat Nov 25 17:08:15 2006 +0100
1999fe5e51b7Smrg
2000fe5e51b7Smrg    Removed some unused defines from mga_reg.h.
2001fe5e51b7Smrg
2002fe5e51b7Smrgcommit 334c7237078652722d7dec1c74812af46bfd7c67
2003fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2004fe5e51b7SmrgDate:   Sat Nov 25 16:42:49 2006 +0100
2005fe5e51b7Smrg
2006fe5e51b7Smrg    Removed some duplicated register definitions.
2007fe5e51b7Smrg
2008fe5e51b7Smrgcommit be88d58968c604624617f40820dc9a50a92661be
2009fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2010fe5e51b7SmrgDate:   Sun Nov 19 21:04:01 2006 +0100
2011fe5e51b7Smrg
2012fe5e51b7Smrg    Bug #2168: Fix graphics corruptions with Mystique rev 2.
2013fe5e51b7Smrg
2014fe5e51b7Smrgcommit daeecb63567fb394654c9e66d64c3c53658f2c7d
2015fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2016fe5e51b7SmrgDate:   Fri Nov 17 23:08:25 2006 +0100
2017fe5e51b7Smrg
2018fe5e51b7Smrg    Enabled the Exa composite hooks on G550.
2019fe5e51b7Smrg
2020fe5e51b7Smrgcommit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a
2021fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org>
2022fe5e51b7SmrgDate:   Mon Nov 6 23:58:06 2006 -0500
2023fe5e51b7Smrg
2024fe5e51b7Smrg    Minor typofix that was causing configure to exit with a syntax error
2025fe5e51b7Smrg
2026fe5e51b7Smrgcommit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d
2027fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2028fe5e51b7SmrgDate:   Fri Oct 27 11:53:40 2006 -0700
2029fe5e51b7Smrg
2030fe5e51b7Smrg    Bump version to 1.4.4.
2031fe5e51b7Smrg
2032fe5e51b7Smrgcommit 19d950e61b2b33052e52c33add8e70c29ac9d766
2033fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2034fe5e51b7SmrgDate:   Fri Oct 27 11:48:35 2006 -0700
2035fe5e51b7Smrg
2036fe5e51b7Smrg    Convert tests of pMga->Chipset to tests of single bit flags.
2037fe5e51b7Smrg    
2038fe5e51b7Smrg    Several places in the driver contain if-statements that test Chipset against
2039fe5e51b7Smrg    several different values to determine what functionality to use.  Some of
2040fe5e51b7Smrg    these tests, HALCHIPSETS in particular, test as many as 6 different values.
2041fe5e51b7Smrg    This bloats the code size unnecessarilly.  Instead we cache the results of
2042fe5e51b7Smrg    some of those tests in single bit flags stored in pMga.
2043fe5e51b7Smrg    
2044fe5e51b7Smrg    These changes are similar to some changes in the pci-rework branch.
2045fe5e51b7Smrg
2046fe5e51b7Smrgcommit d28c4a3307984b86e0f3cc68fa48cdc01e307a7c
2047fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2048fe5e51b7SmrgDate:   Thu Oct 26 19:52:54 2006 -0700
2049fe5e51b7Smrg
2050fe5e51b7Smrg    Fix bug #8666.  git-bisect for the win!
2051fe5e51b7Smrg    
2052fe5e51b7Smrg    Since && takes precedence over ||, put parenthesis around the || block to
2053fe5e51b7Smrg    make all the operations associate in the intended manner.
2054fe5e51b7Smrg
2055fe5e51b7Smrgcommit 041910d3b9f6284b4b8a7df10f284528a7e79d12
2056fe5e51b7SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net>
2057fe5e51b7SmrgDate:   Fri Oct 13 18:33:39 2006 -0400
2058fe5e51b7Smrg
2059fe5e51b7Smrg    Bump to 1.4.3
2060fe5e51b7Smrg
2061fe5e51b7Smrgcommit 8fee907cac7e5924630e3648bfb72ad9bd021ea8
2062a31a186aSmrgMerge: 7cecee1 2fc0ebf
2063fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2064fe5e51b7SmrgDate:   Tue Oct 10 11:43:52 2006 -0700
2065fe5e51b7Smrg
2066fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
2067fe5e51b7Smrg
2068fe5e51b7Smrgcommit 2fc0ebfbe850c138e840b6653ed1476623aa04a4
2069fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2070fe5e51b7SmrgDate:   Thu Sep 28 18:39:20 2006 +0200
2071fe5e51b7Smrg
2072fe5e51b7Smrg    Make the DUALSTAGE0 code slightly easier to read.
2073fe5e51b7Smrg
2074fe5e51b7Smrgcommit ddd93ae96c5427d4c8d03eb225b66a1a93fa2bc8
2075fe5e51b7SmrgAuthor: David Nusinow <dnusinow@debian.org>
2076fe5e51b7SmrgDate:   Wed Sep 20 20:42:12 2006 -0400
2077fe5e51b7Smrg
2078fe5e51b7Smrg    Minor manpage typofixes. Patch by A. Costa (see Debian bug #364558)
2079fe5e51b7Smrg
2080fe5e51b7Smrgcommit 34ec93796e4be31d95d1ed507660c65a2c60fa43
2081fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2082fe5e51b7SmrgDate:   Wed Sep 20 21:05:16 2006 +0200
2083fe5e51b7Smrg
2084fe5e51b7Smrg    Unbreak the build: MGAStormSync() is required by mga_dga.c.
2085fe5e51b7Smrg
2086fe5e51b7Smrgcommit 954c8d06f2697d4f764583dd3336b4cc266b90fd
2087fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2088fe5e51b7SmrgDate:   Wed Sep 20 20:51:36 2006 +0200
2089fe5e51b7Smrg
2090fe5e51b7Smrg    Removed the XAA atype tables.
2091fe5e51b7Smrg    
2092fe5e51b7Smrg    Added a FIXME on BLK support for GXcopy instead.
2093fe5e51b7Smrg
2094fe5e51b7Smrgcommit ecc155e27b6566196e56de241ae81266e03dc90e
2095a31a186aSmrgMerge: e7b36c6 2e73c29
2096fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2097fe5e51b7SmrgDate:   Wed Sep 20 20:43:55 2006 +0200
2098fe5e51b7Smrg
2099fe5e51b7Smrg    Merge branch 'exa'
2100fe5e51b7Smrg
2101fe5e51b7Smrgcommit 2e73c2989e6cf0f24f8b0c4ae372f0c44dc19755
2102fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2103fe5e51b7SmrgDate:   Wed Sep 20 20:41:18 2006 +0200
2104fe5e51b7Smrg
2105fe5e51b7Smrg    Documented the AccelMethod option (copied from Radeon's man page).
2106fe5e51b7Smrg
2107fe5e51b7Smrgcommit 3f4c12a388af05995273c9abe742f82f84e558a8
2108fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2109fe5e51b7SmrgDate:   Wed Sep 20 20:36:18 2006 +0200
2110fe5e51b7Smrg
2111fe5e51b7Smrg    Removed the DFS stub.
2112fe5e51b7Smrg
2113fe5e51b7Smrgcommit 69cc0060d9516d5fba5fa46607a993f3ebfd5d89
2114fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2115fe5e51b7SmrgDate:   Wed Sep 20 20:26:37 2006 +0200
2116fe5e51b7Smrg
2117fe5e51b7Smrg    Fall back to software rendering for A8 add A8.
2118fe5e51b7Smrg
2119fe5e51b7Smrgcommit e7b36c66852077ffbbffdd20e39ed4b6f24541b7
2120fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2121fe5e51b7SmrgDate:   Mon Sep 18 11:08:51 2006 -0700
2122fe5e51b7Smrg
2123fe5e51b7Smrg    Bump version to 1.4.2.  Bump required server version to 1.1.0 (X.org 7.1)
2124fe5e51b7Smrg    from pre-1.1.0 version.
2125fe5e51b7Smrg
2126fe5e51b7Smrgcommit 5830edf81a0c0119bd2486b48e56fdb9daf72586
2127fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2128fe5e51b7SmrgDate:   Sat Sep 16 23:59:32 2006 +0200
2129fe5e51b7Smrg
2130fe5e51b7Smrg    Generate ChangeLog from git.
2131fe5e51b7Smrg
2132fe5e51b7Smrgcommit 3b2a7b1faf142d4301c55b8951657e177b5ac118
2133fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2134fe5e51b7SmrgDate:   Sat Sep 16 23:06:36 2006 +0200
2135fe5e51b7Smrg
2136fe5e51b7Smrg    Don't install stormdwg.
2137fe5e51b7Smrg
2138fe5e51b7Smrgcommit 3d7c109c4864f021590c3bcf0f09685498225dde
2139fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2140fe5e51b7SmrgDate:   Sat Sep 16 22:31:02 2006 +0200
2141fe5e51b7Smrg
2142fe5e51b7Smrg    Enable the BYPASS332 and NODITHER flags when writing to 8 bpp dests.
2143fe5e51b7Smrg    
2144fe5e51b7Smrg    Thanks to Ville Syrjälä, who noticed these were missing.
2145fe5e51b7Smrg    Note that this messes up glyph compositing (A8 add A8) pretty much, but
2146fe5e51b7Smrg    I don't know what's really going on there yet.
2147fe5e51b7Smrg
2148fe5e51b7Smrgcommit 2eae7c98fcd3f452f9b9c2eef4a9cf820edf69aa
2149fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2150fe5e51b7SmrgDate:   Fri Sep 15 16:01:28 2006 +0200
2151fe5e51b7Smrg
2152fe5e51b7Smrg    More DUALSTAGE0 fixes related to A8 writes.
2153fe5e51b7Smrg    
2154fe5e51b7Smrg    When writing from a texture without an alpha channel to an A8 texture,
2155fe5e51b7Smrg    we now set the alpha channel to 0xff via FCOL.
2156fe5e51b7Smrg
2157fe5e51b7Smrgcommit b1031689212bfbbe832dd73337ea8cd5d66ae2ff
2158fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2159fe5e51b7SmrgDate:   Fri Sep 15 13:43:55 2006 +0200
2160fe5e51b7Smrg
2161fe5e51b7Smrg    Reworked DUALSTAGE0 setup.
2162fe5e51b7Smrg    
2163fe5e51b7Smrg    If we're copying from A8 to A8, we need to replicate the alpha to
2164fe5e51b7Smrg    the color channels.
2165fe5e51b7Smrg
2166fe5e51b7Smrgcommit 965faa3661f73a1d4cbf6368458244dff45a76ad
2167fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2168fe5e51b7SmrgDate:   Wed Sep 13 14:56:29 2006 +0200
2169fe5e51b7Smrg
2170fe5e51b7Smrg    Only use the source texture's alpha channel if it actually has one.
2171fe5e51b7Smrg
2172fe5e51b7Smrgcommit 14202e7c47326e8678bf38a6bda63d608f1f152b
2173fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2174fe5e51b7SmrgDate:   Mon Sep 11 14:22:24 2006 +0200
2175fe5e51b7Smrg
2176fe5e51b7Smrg    Support masks without alpha.
2177fe5e51b7Smrg
2178fe5e51b7Smrgcommit 35651deb8fc3b8b7b0cf4895732f2edeecdabeb7
2179fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2180fe5e51b7SmrgDate:   Sun Sep 10 00:56:10 2006 +0200
2181fe5e51b7Smrg
2182fe5e51b7Smrg    Fixed the remaining MGAAllocateMemory() issues.
2183fe5e51b7Smrg
2184fe5e51b7Smrgcommit d5e9270acf2f914fe7603225ac605cd29830bed6
2185fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2186fe5e51b7SmrgDate:   Sun Sep 10 00:04:48 2006 +0200
2187fe5e51b7Smrg
2188fe5e51b7Smrg    Fixed the engine sync needed for TexturedVideo.
2189fe5e51b7Smrg
2190fe5e51b7Smrgcommit 7739a929100d516e06646a38062df8da1f33f774
2191fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2192fe5e51b7SmrgDate:   Sun Sep 10 00:04:21 2006 +0200
2193fe5e51b7Smrg
2194fe5e51b7Smrg    The XAA path in MGA_SYNC() now only syncs the engine if NeedToSync is set.
2195fe5e51b7Smrg    
2196fe5e51b7Smrg    This makes both paths behave the same way.
2197fe5e51b7Smrg
2198fe5e51b7Smrgcommit 1a045b37db4c7c606ed056addf52d337dbdeb88d
2199fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2200fe5e51b7SmrgDate:   Sat Sep 9 23:58:42 2006 +0200
2201fe5e51b7Smrg
2202fe5e51b7Smrg    Dont't multiply the retval of MGAAllocateMemory() by cpp again.
2203fe5e51b7Smrg
2204fe5e51b7Smrgcommit dfa5807c1f5694728aa92138eb0eab5bd5b8c3d7
2205fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2206fe5e51b7SmrgDate:   Sat Sep 9 13:24:01 2006 +0200
2207fe5e51b7Smrg
2208fe5e51b7Smrg    Make use of MGA_MARK_SYNC.
2209fe5e51b7Smrg
2210fe5e51b7Smrgcommit bfb329542377e8e8141c87ed30389de6d7180e06
2211fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2212fe5e51b7SmrgDate:   Sat Sep 9 13:20:13 2006 +0200
2213fe5e51b7Smrg
2214fe5e51b7Smrg    XV works with EXA now (dumb port of the Radeon code).
2215fe5e51b7Smrg
2216fe5e51b7Smrgcommit 9fa71aef67df48b59f9d70fddd2725f739d171a9
2217fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)>
2218fe5e51b7SmrgDate:   Sat Sep 9 11:58:32 2006 +0200
2219fe5e51b7Smrg
2220fe5e51b7Smrg    Do A8->A8 ops in hardware.
2221fe5e51b7Smrg
2222fe5e51b7Smrgcommit 7a7feb251b8172786755ab81b154bbfb7d193dbc
2223fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)>
2224fe5e51b7SmrgDate:   Sat Sep 9 01:16:26 2006 +0200
2225fe5e51b7Smrg
2226fe5e51b7Smrg    PrepareSourceTexture() cannot fail.
2227fe5e51b7Smrg
2228fe5e51b7Smrgcommit c2545d6e94964fc981746cdf212b5dc9cd4fdd1b
2229fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@hammerfest.(none)>
2230fe5e51b7SmrgDate:   Sat Sep 9 01:14:38 2006 +0200
2231fe5e51b7Smrg
2232fe5e51b7Smrg    Implemented pseudo-DMA based UTS.
2233fe5e51b7Smrg
2234fe5e51b7Smrgcommit 3969fe1176da9e39b722982889a3cccc0f812e59
2235fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2236fe5e51b7SmrgDate:   Thu Sep 7 22:52:26 2006 +0200
2237fe5e51b7Smrg
2238fe5e51b7Smrg    Refactored that texture format lookup code into mgaGetTexFormat().
2239fe5e51b7Smrg
2240fe5e51b7Smrgcommit ad57c370ba8ffcbf0b7cf404c61ed01bc924ddd5
2241fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2242fe5e51b7SmrgDate:   Thu Sep 7 22:21:19 2006 +0200
2243fe5e51b7Smrg
2244fe5e51b7Smrg    Use the right dithering mode for r5g5b5 textures.
2245fe5e51b7Smrg    
2246fe5e51b7Smrg    This makes all of rendercheck's blend tests work.
2247fe5e51b7Smrg
2248fe5e51b7Smrgcommit c39749d6e0e967cd12bcc629c3840905e07dd60c
2249fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2250fe5e51b7SmrgDate:   Thu Sep 7 18:24:08 2006 +0200
2251fe5e51b7Smrg
2252fe5e51b7Smrg    Enable composite hooks on G400/G450 only.
2253fe5e51b7Smrg    
2254fe5e51b7Smrg    The PCI-IDs aren't ordered, so using ">=" there was totally broken.
2255fe5e51b7Smrg    I don't know whether the code works on G550 either, so I'm not enabling
2256fe5e51b7Smrg    it on these cards yet.
2257fe5e51b7Smrg
2258fe5e51b7Smrgcommit 0ee922bb4cce012c980c5d6178fe04e86c5cce53
2259fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2260fe5e51b7SmrgDate:   Thu Sep 7 17:36:23 2006 +0200
2261fe5e51b7Smrg
2262fe5e51b7Smrg    Code cleanup/formatting fixes.
2263fe5e51b7Smrg
2264fe5e51b7Smrgcommit 4ed932caa27df8c6a4c58478d3f9b45815de06f5
2265fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2266fe5e51b7SmrgDate:   Thu Sep 7 17:21:52 2006 +0200
2267fe5e51b7Smrg
2268fe5e51b7Smrg    Moved some FIXMEs.
2269fe5e51b7Smrg
2270fe5e51b7Smrgcommit 3b06475096238b3adc3151f27a92d7a8dbbb0231
2271fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2272fe5e51b7SmrgDate:   Thu Sep 7 17:16:35 2006 +0200
2273fe5e51b7Smrg
2274fe5e51b7Smrg    Put my name in mga_exa.c
2275fe5e51b7Smrg
2276fe5e51b7Smrgcommit 6391a058b333de306c9b11c6a723cb4457e76c8f
2277fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2278fe5e51b7SmrgDate:   Wed Sep 6 16:43:51 2006 +0200
2279fe5e51b7Smrg
2280fe5e51b7Smrg    Fixed the non-EXA build.
2281fe5e51b7Smrg
2282fe5e51b7Smrgcommit 74e85b19e564927337f23f6de25bb58f309e892b
2283fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2284fe5e51b7SmrgDate:   Wed Sep 6 15:38:39 2006 +0200
2285fe5e51b7Smrg
2286fe5e51b7Smrg    Enabled alpha filtering.
2287fe5e51b7Smrg    
2288fe5e51b7Smrg    This doesn't influence rendercheck's test outcome, but helps with
2289fe5e51b7Smrg    evas_xrender_x11_test.
2290fe5e51b7Smrg
2291fe5e51b7Smrgcommit c2490640b4b237239872c5acbde3704e6e1412e9
2292fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2293fe5e51b7SmrgDate:   Wed Sep 6 14:36:38 2006 +0200
2294fe5e51b7Smrg
2295fe5e51b7Smrg    Code cleanup/formatting fixes.
2296fe5e51b7Smrg
2297fe5e51b7Smrgcommit 646a9927b8412b0224e260be46162782e87bf7c4
2298fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2299fe5e51b7SmrgDate:   Wed Sep 6 14:24:26 2006 +0200
2300fe5e51b7Smrg
2301fe5e51b7Smrg    Don't set TAMASK in TEXCTL.
2302fe5e51b7Smrg    
2303fe5e51b7Smrg    According to the specs this disables alpha transparency, which we
2304fe5e51b7Smrg    probably don't want, but the tests say it's good.
2305fe5e51b7Smrg
2306fe5e51b7Smrgcommit e7eccaba96e5bc4ff3ddde49b5245cd448bd5d9b
2307fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2308fe5e51b7SmrgDate:   Wed Sep 6 11:48:16 2006 +0200
2309fe5e51b7Smrg
2310fe5e51b7Smrg    Rendering to (A)BGR isn't supported.
2311fe5e51b7Smrg
2312fe5e51b7Smrgcommit 72338321331fe8830d1d95a1c7f4a4fb5f2d9b0a
2313fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2314fe5e51b7SmrgDate:   Wed Sep 6 10:57:13 2006 +0200
2315fe5e51b7Smrg
2316fe5e51b7Smrg    Disabled color keying.
2317fe5e51b7Smrg
2318fe5e51b7Smrgcommit 056915493981be3f3b9270334e0f992a290dfab6
2319fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2320fe5e51b7SmrgDate:   Mon Aug 28 22:19:23 2006 +0200
2321fe5e51b7Smrg
2322fe5e51b7Smrg    Make this code a little more readable.
2323fe5e51b7Smrg
2324fe5e51b7Smrgcommit b8320d198abe0cd26b2f76b9add634ef8245ba27
2325fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2326fe5e51b7SmrgDate:   Sun Aug 27 16:22:50 2006 +0200
2327fe5e51b7Smrg
2328fe5e51b7Smrg    Minor code cleanup.
2329fe5e51b7Smrg
2330fe5e51b7Smrgcommit c525a7e73ac2ef18933d170f8497351d62e5b1ce
2331fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2332fe5e51b7SmrgDate:   Sun Aug 27 15:22:58 2006 +0200
2333fe5e51b7Smrg
2334fe5e51b7Smrg    Fixed a typo.
2335fe5e51b7Smrg
2336fe5e51b7Smrgcommit e0f76b32992274faa0adb39dfd6df0fc3b434e96
2337fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2338fe5e51b7SmrgDate:   Sun Aug 27 12:44:16 2006 +0200
2339fe5e51b7Smrg
2340fe5e51b7Smrg    Documented the mgaBlendOp array.
2341fe5e51b7Smrg
2342fe5e51b7Smrgcommit 5982e8200270d25a57da8ab0d1a8290cfaec070c
2343fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2344fe5e51b7SmrgDate:   Sun Aug 27 12:27:59 2006 +0200
2345fe5e51b7Smrg
2346fe5e51b7Smrg    Cleaned up the XAA code a bit.
2347fe5e51b7Smrg
2348fe5e51b7Smrgcommit e7ba7c993f4e439672810ec9ce3a24df823051a4
2349fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2350fe5e51b7SmrgDate:   Sat Aug 26 22:33:25 2006 +0200
2351fe5e51b7Smrg
2352fe5e51b7Smrg    Enable composite hooks on G400 or greater.
2353fe5e51b7Smrg
2354fe5e51b7Smrgcommit 6c365757891c3e0e0a55c7bea995ef8a4fb3f69c
2355fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2356fe5e51b7SmrgDate:   Sat Aug 26 22:32:25 2006 +0200
2357fe5e51b7Smrg
2358fe5e51b7Smrg    Added missing mgaSetup() call to the PrepareComposite hook.
2359fe5e51b7Smrg
2360fe5e51b7Smrgcommit 2efbc687fcc0d05dca241e4079d9236d9cce0dde
2361fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2362fe5e51b7SmrgDate:   Sat Aug 26 22:27:34 2006 +0200
2363fe5e51b7Smrg
2364fe5e51b7Smrg    Added a couple of missing newlines.
2365fe5e51b7Smrg
2366fe5e51b7Smrgcommit 17153c794d532f27a4248c3f64eba95ede62be87
2367fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2368fe5e51b7SmrgDate:   Sat Aug 26 21:42:41 2006 +0200
2369fe5e51b7Smrg
2370fe5e51b7Smrg    The texture mapping opcode is 6, not 5.
2371fe5e51b7Smrg
2372fe5e51b7Smrgcommit 13f649c65784192c30c18581d8795f3c47060644
2373fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2374fe5e51b7SmrgDate:   Sat Aug 26 20:03:36 2006 +0200
2375fe5e51b7Smrg
2376fe5e51b7Smrg    Removed ajax' comments on the Copy code, it seems to work well.
2377fe5e51b7Smrg
2378fe5e51b7Smrgcommit 4bf16b5f26266132f0c3e9c058df8014d52d56f1
2379fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2380fe5e51b7SmrgDate:   Sat Aug 26 18:04:08 2006 +0200
2381fe5e51b7Smrg
2382fe5e51b7Smrg    Clean up color/planemask replicating.
2383fe5e51b7Smrg
2384fe5e51b7Smrgcommit 5d001aeb21aabde5b6cd919692de726ebaeb3481
2385fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2386fe5e51b7SmrgDate:   Sat Aug 26 18:00:49 2006 +0200
2387fe5e51b7Smrg
2388fe5e51b7Smrg    Fixed alignment values (taken from kdrive).
2389fe5e51b7Smrg
2390fe5e51b7Smrgcommit 693f165e2c6c431e6c61c835781883c2bcef5876
2391fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2392fe5e51b7SmrgDate:   Fri Aug 25 22:40:17 2006 +0200
2393fe5e51b7Smrg
2394fe5e51b7Smrg    Fixed corruption on copy, by copying kdrive's waitmarker code.
2395fe5e51b7Smrg
2396fe5e51b7Smrgcommit 7fbd85b3621f5368ebce178e5e55b0cbd5a80733
2397fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2398fe5e51b7SmrgDate:   Fri Aug 25 22:33:06 2006 +0200
2399fe5e51b7Smrg
2400fe5e51b7Smrg    MGASelectBuffer() is only need for XAA.
2401fe5e51b7Smrg
2402fe5e51b7Smrgcommit 9b24934be499fe5de9fdc02a71e41906c50791d9
2403fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2404fe5e51b7SmrgDate:   Thu Aug 10 22:01:19 2006 +0200
2405fe5e51b7Smrg
2406fe5e51b7Smrg    Switched the MACCESS code to the stuff from mga_storm.c.
2407fe5e51b7Smrg
2408fe5e51b7Smrgcommit 398447c041cffdc712a86f9fe9b58c3f5189c86e
2409fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2410fe5e51b7SmrgDate:   Thu Aug 10 21:31:49 2006 +0200
2411fe5e51b7Smrg
2412fe5e51b7Smrg    Call exaMarkSync() where we'd set the NeedToSync flag for XAA.
2413fe5e51b7Smrg
2414fe5e51b7Smrgcommit b1126b4ab81c12f178fb7366a52b6f2d38af3810
2415fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2416fe5e51b7SmrgDate:   Thu Aug 10 21:25:48 2006 +0200
2417fe5e51b7Smrg
2418fe5e51b7Smrg    Removed XAA specific code from MGAGetQuiescence.
2419fe5e51b7Smrg
2420fe5e51b7Smrgcommit 9141effdbbcd2b3419874ebb4e3898fca3474417
2421fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2422fe5e51b7SmrgDate:   Thu Aug 10 20:42:56 2006 +0200
2423fe5e51b7Smrg
2424fe5e51b7Smrg    Added another chunk of kdrive code to mgaPrepareSolid().
2425fe5e51b7Smrg
2426fe5e51b7Smrgcommit 3f440e499b5d0b073118855fe39fa4077971c06e
2427fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2428fe5e51b7SmrgDate:   Thu Aug 10 20:40:51 2006 +0200
2429fe5e51b7Smrg
2430fe5e51b7Smrg    Added mgaSetup() from kdrive code.
2431fe5e51b7Smrg
2432fe5e51b7Smrgcommit 9285dec527a5f0ec21384b1e079a3878b622a6c2
2433fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2434fe5e51b7SmrgDate:   Thu Aug 10 20:03:18 2006 +0200
2435fe5e51b7Smrg
2436fe5e51b7Smrg    Disable composite hooks for now, to reduce breakage.
2437fe5e51b7Smrg
2438fe5e51b7Smrgcommit db87a5ac8feca5f0126c7af4c51f69222fae7dd9
2439fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2440fe5e51b7SmrgDate:   Thu Aug 10 20:02:51 2006 +0200
2441fe5e51b7Smrg
2442fe5e51b7Smrg    Wait until the DMA engine is idle in mgaWaitMarker.
2443fe5e51b7Smrg
2444fe5e51b7Smrgcommit 84ec0db961de3b10ac02ec5ae6adcec5cc439069
2445fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2446fe5e51b7SmrgDate:   Thu Aug 10 19:49:22 2006 +0200
2447fe5e51b7Smrg
2448fe5e51b7Smrg    Initial commit of the Exa bits.
2449fe5e51b7Smrg    
2450fe5e51b7Smrg    Based on ajax' mga-exa-2.patch with some straight forward fixes
2451fe5e51b7Smrg    by myself.
2452fe5e51b7Smrg
2453fe5e51b7Smrgcommit 7cecee186c889902bed9b7fa042f0bd3cc0297ef
2454a31a186aSmrgMerge: 160b1f7 bde5920
2455fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)>
2456fe5e51b7SmrgDate:   Thu Aug 10 10:19:55 2006 -0700
2457fe5e51b7Smrg
2458fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
2459fe5e51b7Smrg
2460fe5e51b7Smrgcommit bde592047cd62194d7ef67520a9fdbaf269a8b90
2461fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2462fe5e51b7SmrgDate:   Wed Aug 9 21:59:42 2006 +0200
2463fe5e51b7Smrg
2464fe5e51b7Smrg    Bug #7265: Fix MGA DRI locking.
2465fe5e51b7Smrg    
2466fe5e51b7Smrg    The server expects the driver to take the DRI lock in the wakeup
2467fe5e51b7Smrg    handler, and release it in the block handler.
2468fe5e51b7Smrg    The old locking scheme didn't work like this, which caused problems.
2469fe5e51b7Smrg    We now no longer override wakeup/block handler and just use the ones
2470fe5e51b7Smrg    provided by the server. This means the DRI lock will be taken
2471fe5e51b7Smrg    "all the time" and not just when it's needed by the driver.
2472fe5e51b7Smrg    MGADRISwapContext* are activated again, so the wakeup handler could be
2473fe5e51b7Smrg    removed.
2474fe5e51b7Smrg    I didn't notice any DRI performance drop, but I didn't do serious
2475fe5e51b7Smrg    benchmarking either.
2476fe5e51b7Smrg
2477fe5e51b7Smrgcommit 160b1f79fab7266a24b7d1a680cdf29bad9707c1
2478fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)>
2479fe5e51b7SmrgDate:   Tue Aug 8 16:59:15 2006 -0700
2480fe5e51b7Smrg
2481fe5e51b7Smrg    Store the pci_device pointer passed into MGAPciProbe instead of
2482fe5e51b7Smrg    searching for it in MGAPreInit.
2483fe5e51b7Smrg
2484fe5e51b7Smrgcommit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68
2485a31a186aSmrgMerge: 95e0722 7170de8
2486fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)>
2487fe5e51b7SmrgDate:   Wed Jul 26 11:47:32 2006 -0700
2488fe5e51b7Smrg
2489fe5e51b7Smrg    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
2490fe5e51b7Smrg
2491fe5e51b7Smrgcommit 95e0722ff2e8878cdd6bb0e349eecab042b879db
2492fe5e51b7SmrgAuthor: Ian Romanick <idr@umwelt.(none)>
2493fe5e51b7SmrgDate:   Wed Jul 26 11:46:52 2006 -0700
2494fe5e51b7Smrg
2495fe5e51b7Smrg    Current state of MGA driver modified to work with the xserver
2496fe5e51b7Smrg    pci-rework branch.
2497fe5e51b7Smrg
2498fe5e51b7Smrgcommit 7170de83762660efebff79be84f763008466ffa7
2499fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2500fe5e51b7SmrgDate:   Wed Jul 26 17:06:18 2006 +0200
2501fe5e51b7Smrg
2502fe5e51b7Smrg    Merged the various .cvsignores into .gitignore
2503fe5e51b7Smrg
2504fe5e51b7Smrgcommit 80bf41170af91b62b9950a5cf7baf3c364a8f539
2505fe5e51b7SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de>
2506fe5e51b7SmrgDate:   Tue Jul 25 22:03:22 2006 +0200
2507fe5e51b7Smrg
2508fe5e51b7Smrg    Fixed some warnings
2509fe5e51b7Smrg
2510fe5e51b7Smrgcommit 78c12368fa1c1985f41ce856ff453a967429870a
2511fe5e51b7SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com>
2512fe5e51b7SmrgDate:   Mon Jul 10 18:53:05 2006 -0700
2513fe5e51b7Smrg
2514fe5e51b7Smrg    Add includes of <unistd.h> & <stdlib.h> to replace previously xf86wrapped prototypes
2515fe5e51b7Smrg    
2516fe5e51b7Smrg    Fixes these warnings:
2517fe5e51b7Smrg    make.out:"mga_dacG.c", line 195: warning: implicit function declaration: abs
2518fe5e51b7Smrg    make.out:"mga_dacG.c", line 1117: warning: implicit function declaration: usleepmake.out:"mga_driver.c", line 692: warning: implicit function declaration: usleep
2519fe5e51b7Smrg
2520fe5e51b7Smrgcommit c0dfac86e75ea63ae0c25c070bc661b6f41d35eb
2521fe5e51b7SmrgAuthor: Peter Breitenlohner <peb@mppmu.mpg.de>
2522fe5e51b7SmrgDate:   Mon Jul 10 17:21:25 2006 -0700
2523fe5e51b7Smrg
2524fe5e51b7Smrg    Bug #7369: mga(4) manpage typo mutilates part of text
2525fe5e51b7Smrg    
2526fe5e51b7Smrg    Bugzilla #7369: <https://bugs.freedesktop.org/show_bug.cgi?id=7369>
2527fe5e51b7Smrg    Patch #6079: <https://bugs.freedesktop.org/attachment.cgi?id=6079>
2528fe5e51b7Smrg
2529fe5e51b7Smrgcommit fe23ada5cc8c13fa30aa210df9968a4042593ea2
2530fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2531fe5e51b7SmrgDate:   Wed Jun 14 21:52:21 2006 +0000
2532fe5e51b7Smrg
2533fe5e51b7Smrg    Refactor AccelFlags setting and some other feature settings for various MGA
2534fe5e51b7Smrg        hardware. Eventually AccelFlags will be set from a table look-up, but
2535fe5e51b7Smrg        that will come after the PCI rework is merged.
2536fe5e51b7Smrg
2537fe5e51b7Smrgcommit 72667a14fa330ef3b08dd72ab84ff09b164ff5ed
2538fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2539fe5e51b7SmrgDate:   Wed Apr 12 20:26:35 2006 +0000
2540fe5e51b7Smrg
2541fe5e51b7Smrg    Bug #6562: s/MAXSHORT/SHRT_MAX/ for POSIX. (Matthieu Herrb)
2542fe5e51b7Smrg
2543fe5e51b7Smrgcommit f0a3923fe65abb04e64e3159b154f677e76423ca
2544fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2545fe5e51b7SmrgDate:   Sat Apr 8 01:33:58 2006 +0000
2546fe5e51b7Smrg
2547fe5e51b7Smrg    Bump to 1.4.1 for Xv changes.
2548fe5e51b7Smrg
2549fe5e51b7Smrgcommit ae30dfebbd6883f1a863d193d6c8e971c0dec92b
2550fe5e51b7SmrgAuthor: Aaron Plattner <aplattner@nvidia.com>
2551fe5e51b7SmrgDate:   Fri Apr 7 23:09:17 2006 +0000
2552fe5e51b7Smrg
2553fe5e51b7Smrg    Add a DrawablePtr argument to the XV functions to pave the way for
2554fe5e51b7Smrg        redirected video.
2555fe5e51b7Smrg
2556fe5e51b7Smrgcommit 8bc544169adfed95b11062fe9816ecf31e35b014
2557fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2558fe5e51b7SmrgDate:   Fri Apr 7 19:21:13 2006 +0000
2559fe5e51b7Smrg
2560fe5e51b7Smrg    Unlibcwrap. Bump server version requirement. Bump to 1.4.0.
2561fe5e51b7Smrg
2562fe5e51b7Smrgcommit 07373669514b104a11fb1b4ed5214f3764c83a2f
2563fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2564fe5e51b7SmrgDate:   Sun Apr 2 01:03:50 2006 +0000
2565fe5e51b7Smrg
2566fe5e51b7Smrg    Bug #6328: Add support for Matrox G200SE chips. (Matrox)
2567fe5e51b7Smrg
2568fe5e51b7Smrgcommit 88ece3c37c4ed529686b6cdea1bf9b6eed8fceea
2569fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2570fe5e51b7SmrgDate:   Mon Mar 20 19:12:50 2006 +0000
2571fe5e51b7Smrg
2572fe5e51b7Smrg    Bug #5587: Refactor mga_storm.c to only build once for all color depths.
2573fe5e51b7Smrg        (Ian Romanick)
2574fe5e51b7Smrg
2575fe5e51b7Smrgcommit 089c7be83d6cace94a692ec46a4c3a05b32fd4f4
2576fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2577fe5e51b7SmrgDate:   Wed Mar 15 20:21:23 2006 +0000
2578fe5e51b7Smrg
2579fe5e51b7Smrg    Coverity #1009: Check for NULL first before assigning to pMGADRI.
2580fe5e51b7Smrg
2581fe5e51b7Smrgcommit 20eb3f159fe3629d1bfb6b9437912f55b690e068
2582fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2583fe5e51b7SmrgDate:   Wed Mar 15 20:18:43 2006 +0000
2584fe5e51b7Smrg
2585fe5e51b7Smrg    Coverity #92: Eliminate a dead code path.
2586fe5e51b7Smrg
2587fe5e51b7Smrgcommit 0be3b6f166709984611affad740bddaecd0bb880
2588fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2589fe5e51b7SmrgDate:   Wed Dec 21 02:30:00 2005 +0000
2590fe5e51b7Smrg
2591fe5e51b7Smrg    Update package version for X11R7 release.
2592fe5e51b7Smrg
2593fe5e51b7Smrgcommit 7c3b4b0ba321d2a96a6586db585e194102f51bfe
2594fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2595fe5e51b7SmrgDate:   Mon Dec 19 16:25:53 2005 +0000
2596fe5e51b7Smrg
2597fe5e51b7Smrg    Stub COPYING files
2598fe5e51b7Smrg
2599fe5e51b7Smrgcommit 216fcca904e358175f28b4685cdc657c4ebd2245
2600fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com>
2601fe5e51b7SmrgDate:   Mon Dec 19 09:07:50 2005 +0000
2602fe5e51b7Smrg
2603fe5e51b7Smrg    Typo fixes, mailing list & url updates, and other changes to prepare for
2604fe5e51b7Smrg        X11R6.9 & 7.0 releases.
2605fe5e51b7Smrg
2606fe5e51b7Smrgcommit 44ed6a4d7df5353068a1ec464aedee2754a0689c
2607fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2608fe5e51b7SmrgDate:   Thu Dec 15 00:24:17 2005 +0000
2609fe5e51b7Smrg
2610fe5e51b7Smrg    Update package version number for final X11R7 release candidate.
2611fe5e51b7Smrg
2612fe5e51b7Smrgcommit 051c589bc038a8f55754decfc90f4a87cec1d318
2613fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2614fe5e51b7SmrgDate:   Tue Dec 6 22:48:35 2005 +0000
2615fe5e51b7Smrg
2616fe5e51b7Smrg    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
2617fe5e51b7Smrg
2618fe5e51b7Smrgcommit 8cd8149a942facfadd961b1ce5ab7a4ec4ab13f6
2619fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2620fe5e51b7SmrgDate:   Sat Dec 3 05:49:34 2005 +0000
2621fe5e51b7Smrg
2622fe5e51b7Smrg    Update package version number for X11R7 RC3 release.
2623fe5e51b7Smrg
2624fe5e51b7Smrgcommit 372574887ecbb78b5c88f9b70f380f18e22146c0
2625fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2626fe5e51b7SmrgDate:   Fri Dec 2 02:16:08 2005 +0000
2627fe5e51b7Smrg
2628fe5e51b7Smrg    Remove extraneous AC_MSG_RESULT.
2629fe5e51b7Smrg
2630fe5e51b7Smrgcommit 6431eaab73efce760730cc0214819d970fdd39f2
2631fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2632fe5e51b7SmrgDate:   Wed Nov 30 18:51:34 2005 +0000
2633fe5e51b7Smrg
2634fe5e51b7Smrg    Bump libdrm dep to 2.0.
2635fe5e51b7Smrg
2636fe5e51b7Smrgcommit 161a85033eecfb831d6772515b09074bd4632f3f
2637fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2638fe5e51b7SmrgDate:   Tue Nov 29 23:29:59 2005 +0000
2639fe5e51b7Smrg
2640fe5e51b7Smrg    Only build dlloader modules by default.
2641fe5e51b7Smrg
2642fe5e51b7Smrgcommit 352f65e64e1276511cb253bf52534a1f30776984
2643fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com>
2644fe5e51b7SmrgDate:   Mon Nov 28 22:04:09 2005 +0000
2645fe5e51b7Smrg
2646fe5e51b7Smrg    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
2647fe5e51b7Smrg        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
2648fe5e51b7Smrg
2649fe5e51b7Smrgcommit e29459c50ebcde0683aa6e33f936e8cee2eb93a9
2650fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org>
2651fe5e51b7SmrgDate:   Mon Nov 21 10:49:15 2005 +0000
2652fe5e51b7Smrg
2653fe5e51b7Smrg    Add .cvsignores for drivers.
2654fe5e51b7Smrg
2655fe5e51b7Smrgcommit df888be94ca02f16e5dc2d1eabc4ede4b1e15369
2656fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2657fe5e51b7SmrgDate:   Wed Nov 9 21:31:20 2005 +0000
2658fe5e51b7Smrg
2659fe5e51b7Smrg    Bump version numbers for X11R6.9/X11R7 RC2.
2660fe5e51b7Smrg
2661fe5e51b7Smrgcommit 241c2b24d61266cd363f7e5f20ba8538482199df
2662fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2663fe5e51b7SmrgDate:   Wed Nov 9 21:15:15 2005 +0000
2664fe5e51b7Smrg
2665fe5e51b7Smrg    Update package version number for X11R7 RC2 release.
2666fe5e51b7Smrg
2667fe5e51b7Smrgcommit a04e08832096e7f6e0763fa17a3684da24916ffe
2668fe5e51b7SmrgAuthor: Matthias Hopf <mhopf@suse.de>
2669fe5e51b7SmrgDate:   Wed Nov 9 17:42:58 2005 +0000
2670fe5e51b7Smrg
2671fe5e51b7Smrg    Bug #4998: Add ';' and ',' as valid separators for MetaModes as well.
2672fe5e51b7Smrg
2673fe5e51b7Smrgcommit 00d81f8f104805702ee84c6d7781502bfe37f86b
2674fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2675fe5e51b7SmrgDate:   Tue Nov 1 15:08:53 2005 +0000
2676fe5e51b7Smrg
2677fe5e51b7Smrg    Update pkgcheck depedencies to work with separate build roots.
2678fe5e51b7Smrg
2679fe5e51b7Smrgcommit c906a237b118a80f7d9e1428ad7efd5f189232e6
2680fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2681fe5e51b7SmrgDate:   Fri Oct 21 18:40:19 2005 +0000
2682fe5e51b7Smrg
2683fe5e51b7Smrg    Bug #4829: Remove some useless DRI symbol checks.
2684fe5e51b7Smrg
2685fe5e51b7Smrgcommit f1db5fcc072b0066c7dbe42a2064200191ee759e
2686fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2687fe5e51b7SmrgDate:   Wed Oct 19 02:48:03 2005 +0000
2688fe5e51b7Smrg
2689fe5e51b7Smrg    Update package version number for RC1 release.
2690fe5e51b7Smrg
2691fe5e51b7Smrgcommit 12b4af203c4c228521c1095b6f08e02601486137
2692fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com>
2693fe5e51b7SmrgDate:   Tue Oct 18 00:01:53 2005 +0000
2694fe5e51b7Smrg
2695fe5e51b7Smrg    Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
2696fe5e51b7Smrg        substitutions to work better with BSD make
2697fe5e51b7Smrg
2698fe5e51b7Smrgcommit 58ee3b290ef6b1366a1c241063120dece82802cb
2699fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2700fe5e51b7SmrgDate:   Mon Oct 17 22:57:34 2005 +0000
2701fe5e51b7Smrg
2702fe5e51b7Smrg    More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
2703fe5e51b7Smrg        of indirectly
2704fe5e51b7Smrg
2705fe5e51b7Smrgcommit e8f6552523f6a2f651fd596db263213eef5edcfe
2706fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com>
2707fe5e51b7SmrgDate:   Mon Oct 17 00:09:03 2005 +0000
2708fe5e51b7Smrg
2709fe5e51b7Smrg    Use sed & cpp to substitute variables in driver man pages
2710fe5e51b7Smrg
2711fe5e51b7Smrgcommit 52497dac4be07bb5a4ca1a73ec6198851173b6c4
27121e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2713fe5e51b7SmrgDate:   Tue Sep 27 20:53:19 2005 +0000
2714fe5e51b7Smrg
2715fe5e51b7Smrg    Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
2716fe5e51b7Smrg        newport to accomodate various new documentation and utility files.
2717fe5e51b7Smrg
2718fe5e51b7Smrgcommit d3a3818010a620ae57dd6831466ce9cd4137b28f
2719fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2720fe5e51b7SmrgDate:   Fri Sep 9 23:15:45 2005 +0000
2721fe5e51b7Smrg
2722fe5e51b7Smrg    Clean up some warnings. Fix some '#ifdef USEMGAHAL' issues that had caused
2723fe5e51b7Smrg        the number of curl-braces to be unbalanced.
2724fe5e51b7Smrg
2725fe5e51b7Smrgcommit 000f59ff4686d1dbda673bf5a700f33615f9eb89
2726fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
2727fe5e51b7SmrgDate:   Fri Aug 26 07:10:29 2005 +0000
2728fe5e51b7Smrg
2729fe5e51b7Smrg    Wrapping, escaped dashes, and other TeX syntax fixes throughout the
2730fe5e51b7Smrg        manpage. (Branden Robinson, Debian #047)
2731fe5e51b7Smrg
2732fe5e51b7Smrgcommit b96b4242f98f7933fab7c1ffe95d04a8b602969e
2733fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
2734fe5e51b7SmrgDate:   Sun Aug 21 19:00:39 2005 +0000
2735fe5e51b7Smrg
2736fe5e51b7Smrg    Fix DRI header checks, bump to 1.1.2.2.
2737fe5e51b7Smrg
2738fe5e51b7Smrgcommit db7dde6e7db534e47f43a0b371f5474d24fcaf0f
2739fe5e51b7SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com>
2740fe5e51b7SmrgDate:   Sun Aug 21 01:11:46 2005 +0000
2741fe5e51b7Smrg
2742fe5e51b7Smrg    programs/Xserver/hw/xfree86/drivers/mga/mga_bios.c #include "Xmd.h" ->
2743fe5e51b7Smrg        <X11/Xmd.h>
2744fe5e51b7Smrg
2745fe5e51b7Smrgcommit 694247a948d68f711c822c2ffaa9032b3cf4255b
2746fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
2747fe5e51b7SmrgDate:   Thu Aug 18 09:03:47 2005 +0000
2748fe5e51b7Smrg
2749fe5e51b7Smrg    Update autogen.sh to one that does objdir != srcdir.
2750fe5e51b7Smrg
2751fe5e51b7Smrgcommit eec95d13f408f5489fe8c6b611d080c275c541fb
2752fe5e51b7SmrgAuthor: Alan Hourihane <alanh@fairlite.demon.co.uk>
2753fe5e51b7SmrgDate:   Mon Aug 15 07:30:05 2005 +0000
2754fe5e51b7Smrg
2755fe5e51b7Smrg    Egbert's 64bit fixes for mixed 32/64bit clients
2756fe5e51b7Smrg
2757fe5e51b7Smrgcommit d4b7edf86b63fb9af377bc4605381c8016a683a5
2758fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2759fe5e51b7SmrgDate:   Sun Aug 14 00:18:25 2005 +0000
2760fe5e51b7Smrg
2761fe5e51b7Smrg    add mga_bios.c, bump version number.
2762fe5e51b7Smrg
2763fe5e51b7Smrgcommit 4c5535161d81174747920a2a3e70ec27a1bcf911
2764fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2765fe5e51b7SmrgDate:   Fri Aug 5 23:04:33 2005 +0000
2766fe5e51b7Smrg
2767fe5e51b7Smrg    I have resolved this by making all the "Direct rendering disabled" messages
2768fe5e51b7Smrg        X_WARNING and all the "Direct rendering enabled" messages X_INFO.
2769fe5e51b7Smrg        Ideally, we need to factor some of this stuff out to common code. There
2770fe5e51b7Smrg        is a *LOT* of duplication among the *_dri.c files under
2771fe5e51b7Smrg        programs/Xserver/hw/xfree86/drivers.
2772fe5e51b7Smrg    I'm trying to clean up as much low hanging fruit as I can and got tired of
2773fe5e51b7Smrg        waiting for ajax. :P
2774fe5e51b7Smrg
2775fe5e51b7Smrgcommit 4a7656a726cd6b848df65cbd9c18bbfd8e09fb47
2776fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2777fe5e51b7SmrgDate:   Fri Aug 5 18:34:11 2005 +0000
2778fe5e51b7Smrg
2779fe5e51b7Smrg    Now that Mesa has been merged into the tree, set the default value for
2780fe5e51b7Smrg        OldDmaInit to false.
2781fe5e51b7Smrg
2782fe5e51b7Smrgcommit 22db234c995d12d3e538198b41fba0d555eb10c2
2783fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2784fe5e51b7SmrgDate:   Sun Jul 31 17:19:29 2005 +0000
2785fe5e51b7Smrg
2786fe5e51b7Smrg    Post-merge fixups:
2787fe5e51b7Smrg    - Disable building the gamma driver
2788fe5e51b7Smrg    - Fix numerous Imakefiles to get header paths and subdirs right
2789fe5e51b7Smrg    - Symlink client-side GLX lib source from Mesa
2790fe5e51b7Smrg    - Add new shader subdirs to the Mesa core build
2791fe5e51b7Smrg    - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
2792fe5e51b7Smrg        since they don't generate protocol, and it was breaking the build.
2793fe5e51b7Smrg
2794fe5e51b7Smrgcommit 67a25f0c366873050388928a6e712e8eed0e0e67
2795fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2796fe5e51b7SmrgDate:   Fri Jul 29 21:22:43 2005 +0000
2797fe5e51b7Smrg
2798fe5e51b7Smrg    Various changes preparing packages for RC0:
2799fe5e51b7Smrg    - Verify and update package version numbers as needed
2800fe5e51b7Smrg    - Implement versioning scheme
2801fe5e51b7Smrg    - Change bug address to point to bugzilla bug entry form
2802fe5e51b7Smrg    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
2803fe5e51b7Smrg        reenable it)
2804fe5e51b7Smrg    - Fix makedepend to use pkgconfig and pass distcheck
2805fe5e51b7Smrg    - Update build script to build macros first
2806fe5e51b7Smrg    - Update modular Xorg version
2807fe5e51b7Smrg
2808fe5e51b7Smrgcommit 73d19fde3b2c78693298b60252e1a67e28cb708a
28091e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2810fe5e51b7SmrgDate:   Thu Jul 28 15:48:19 2005 +0000
2811fe5e51b7Smrg
2812fe5e51b7Smrg    Add missing backslash, patch from Donnie Berkholz
2813fe5e51b7Smrg
2814fe5e51b7Smrgcommit 3e06876c193d945f2df0c2521a2c80ec73ce5cb8
28151e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2816fe5e51b7SmrgDate:   Wed Jul 27 21:23:29 2005 +0000
2817fe5e51b7Smrg
2818fe5e51b7Smrg    Add xf86driproto to dependencies for drivers with DRI support. Patch from
2819fe5e51b7Smrg        Donnie Berkholz
2820fe5e51b7Smrg
2821fe5e51b7Smrgcommit dccbba1b92e14df05aa351a28d4439ea4f625967
2822fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2823fe5e51b7SmrgDate:   Wed Jul 27 07:38:14 2005 +0000
2824fe5e51b7Smrg
2825fe5e51b7Smrg    Include binding.h to fix make distcheck
2826fe5e51b7Smrg
2827fe5e51b7Smrgcommit a5f5f658a9875ea2dfb01200305dab54ce4115ac
28281e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2829fe5e51b7SmrgDate:   Tue Jul 26 18:29:39 2005 +0000
2830fe5e51b7Smrg
2831fe5e51b7Smrg    symlink.sh: add binding.h from mga/HALlib add nsc/gfx add nsc/panel
2832fe5e51b7Smrg        glint_driver.c: remove include of cfb8_32.h mga_driver.c: remove
2833fe5e51b7Smrg        include of cfb8_32.h modularizevideodriver.sh: fix typo
2834fe5e51b7Smrg
2835fe5e51b7Smrgcommit efca764ce95094531baf14daf6e5e538cc1e9210
28361e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2837fe5e51b7SmrgDate:   Tue Jul 26 01:18:43 2005 +0000
2838fe5e51b7Smrg
2839fe5e51b7Smrg    "Build system for `basename $PWD | sed s/xf86-video-//`"
2840fe5e51b7Smrg
2841fe5e51b7Smrgcommit e2f4c1e72976180cfbf2486236468e25f81ca431
2842fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2843fe5e51b7SmrgDate:   Tue Jul 26 00:01:58 2005 +0000
2844fe5e51b7Smrg
2845fe5e51b7Smrg    Famous last words: "This last change is so trivial, I don't even need to
2846fe5e51b7Smrg        compile-test it!" This commit fixes a dumb-dumb error by me. I broke
2847fe5e51b7Smrg        the multi-line X_ERROR message into multiple xf86DrvMsg calls to get
2848fe5e51b7Smrg        the formating correct in the log. However, I didn't bother to put in
2849fe5e51b7Smrg        the correct punctuation when I did so.
2850fe5e51b7Smrg
2851fe5e51b7Smrgcommit fdb59d2535d7d517a14f3d6489ba91f3dac3b99f
2852fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2853fe5e51b7SmrgDate:   Mon Jul 25 23:14:50 2005 +0000
2854fe5e51b7Smrg
2855fe5e51b7Smrg    PInS data on later cards (G200 and later) contains information about the
2856fe5e51b7Smrg        physical bus used for the card. This allows accurate detection of PCI
2857fe5e51b7Smrg        cards that use a PCI-to-PCI bridge with an AGP chip.
2858fe5e51b7Smrg    Correctly disable DRI on PCI cards used with pre-3.2 DRM. Previously the
2859fe5e51b7Smrg        test was performed based on PCI ID (see above for why this is wrong)
2860fe5e51b7Smrg        and was done *before* the DRM version was known.
2861fe5e51b7Smrg    Bug #3759: <https://bugs.freedesktop.org/show_bug.cgi?id=3759> Correctly
2862fe5e51b7Smrg        determine the PLL reference frequency from the PInS data. Previously
2863fe5e51b7Smrg        the wrong bit was tested. Blame the dumb programmer that used
2864fe5e51b7Smrg        cut-and-paste (that would be me).
2865fe5e51b7Smrg
2866fe5e51b7Smrgcommit 6030e8206db010f65199cbf5d332d2b47cdb3580
2867fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2868fe5e51b7SmrgDate:   Mon Jul 11 02:29:51 2005 +0000
2869fe5e51b7Smrg
2870fe5e51b7Smrg    Prep for modular builds by adding guarded #include "config.h" everywhere.
2871fe5e51b7Smrg
2872fe5e51b7Smrgcommit b52ca7871cb6cf7a01210ec21cd9c20e5453f4fd
2873fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
2874fe5e51b7SmrgDate:   Sun Jul 3 03:28:27 2005 +0000
2875fe5e51b7Smrg
2876fe5e51b7Smrg    Fix build issues.
2877fe5e51b7Smrg
2878fe5e51b7Smrgcommit 800579ef040cf5df4a8b09a4a8db6118c3d84980
2879fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2880fe5e51b7SmrgDate:   Fri Jul 1 16:21:35 2005 +0000
2881fe5e51b7Smrg
2882fe5e51b7Smrg    Re-write the PInS processing code
2883fe5e51b7Smrg    This patch dumps all of the old BIOS processing code from the MGA DDX. The
2884fe5e51b7Smrg        new code, located in mga_bios.c, is modeled after the code in
2885fe5e51b7Smrg        matroxfb_misc.c (though no actual code was copied). Basically, the BIOS
2886fe5e51b7Smrg        is processed in one place, with "device independent" values stored in a
2887fe5e51b7Smrg        data structure. This data is then used, without extra switch-statments,
2888fe5e51b7Smrg        throughout the driver.
2889fe5e51b7Smrg    In addition, this patch adds support for processing the BIOS on PowerPC
2890fe5e51b7Smrg        systems. On PPC cards, the magic offset values (that give the location
2891fe5e51b7Smrg        of the PInS data) is not in the BIOS. Instead the driver has to search
2892fe5e51b7Smrg        the BIOS for the PInS structure signature. The patch does this and
2893fe5e51b7Smrg        correctly handles byte-ordering (and data alignement) issues.
2894fe5e51b7Smrg    This code has been tested on an AGP G400 on x86 and a PCI G450 on PowerPC.
2895fe5e51b7Smrg    NOTE: The file mga_bios.h is also removed. The "documentation" in that file
2896fe5e51b7Smrg        was moved to the file mga_PInS.txt. This file documents, as much as
2897fe5e51b7Smrg        possible, the layout of the various PInS datastructure versions. The
2898fe5e51b7Smrg        information in that file is 100% based on the old mga_bios.h and the
2899fe5e51b7Smrg        code in matroxfb_misc.c. No additional information from Matrox
2900fe5e51b7Smrg        documentation is included in that file. This just puts the information
2901fe5e51b7Smrg        that was already known in one place.
2902fe5e51b7Smrg    Xorg Bug: 3553
2903fe5e51b7Smrg
2904fe5e51b7Smrgcommit acadff30e40af48592e50e55a94f9c81ab856971
2905fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2906fe5e51b7SmrgDate:   Sat Jun 25 21:16:55 2005 +0000
2907fe5e51b7Smrg
2908fe5e51b7Smrg    Bug #3626: _X_EXPORT tags for video and input drivers.
2909fe5e51b7Smrg
2910fe5e51b7Smrgcommit 784cd8fabf5a356a8ce501c635e4d09f39a17a0f
2911fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2912fe5e51b7SmrgDate:   Thu Jun 16 00:11:24 2005 +0000
2913fe5e51b7Smrg
2914fe5e51b7Smrg    Actually commit fix for #3528
2915fe5e51b7Smrg
2916fe5e51b7Smrgcommit 89db1e50a85521189926e1e73b1ddfb4a3e12be0
2917fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2918fe5e51b7SmrgDate:   Wed Jun 15 22:38:36 2005 +0000
2919fe5e51b7Smrg
2920fe5e51b7Smrg    Temporary fixes to work-around the "old" MGA client-side driver in the
2921fe5e51b7Smrg        tree.
2922fe5e51b7Smrg
2923fe5e51b7Smrgcommit a6e0ae358bdb26452444d916a956c07da7fe88f4
2924fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2925fe5e51b7SmrgDate:   Wed Jun 15 20:06:43 2005 +0000
2926fe5e51b7Smrg
2927fe5e51b7Smrg    Adds support for MGA DRM version 3.2.
2928fe5e51b7Smrg    Update MGA DDX to use new features of MGA DRM ersion 3.2 to enable DRI
2929fe5e51b7Smrg        support on PCI cards. Backwards compatability with older client-side
2930fe5e51b7Smrg        drivers is enabled with new Device section settings. See mga.man for
2931fe5e51b7Smrg        details.
2932fe5e51b7Smrg    Xorg bug: 3259 Reviewed by: Eric Anholt
2933fe5e51b7Smrg
2934fe5e51b7Smrgcommit c2e50aad47ce32f528dad2abee8b7a8df363c93e
2935fe5e51b7SmrgAuthor: Ian Romanick <idr@us.ibm.com>
2936fe5e51b7SmrgDate:   Tue Jun 7 23:20:02 2005 +0000
2937fe5e51b7Smrg
2938fe5e51b7Smrg    Numerous comments, clean-ups, and refactorings for the DRI portion of the
2939fe5e51b7Smrg        MGA driver.
2940fe5e51b7Smrg    - Use mga_drm.h instead of mga_common.h. Due to this, all the MGA-specific
2941fe5e51b7Smrg        DRM names were changed to generic versions (i.e., drmMGALock became
2942fe5e51b7Smrg        drm_lock_t).
2943fe5e51b7Smrg    - Merge MGADRIMapInit into MGADRIAGPInit and rename the resulting function
2944fe5e51b7Smrg        MGADRIBootstrapDMA.
2945fe5e51b7Smrg    - Eliminate several unnecessary drmMap calls. The server has no need to map
2946fe5e51b7Smrg        MMIO space, primary DMA buffer space, secondary DMA buffer space, WARP
2947fe5e51b7Smrg        microcode space, or the DRM status page.
2948fe5e51b7Smrg    - Clarified which portions of the client / server DRI interface are no
2949fe5e51b7Smrg        longer used.
2950fe5e51b7Smrg    - Removed some unused fields from MGADRIServerPrivateRec.
2951fe5e51b7Smrg    - Bump MGA_PATCHLEVEL.
2952fe5e51b7Smrg    Reviewed by: Adam Jackson Reviewed by: Eric Anholt
2953fe5e51b7Smrg
2954fe5e51b7Smrgcommit f4b3779cafdbcfeaddf6f55c4b2c67a667ab5d14
2955fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2956fe5e51b7SmrgDate:   Wed May 18 17:47:35 2005 +0000
2957fe5e51b7Smrg
2958fe5e51b7Smrg    Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
2959fe5e51b7Smrg        number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
2960fe5e51b7Smrg        version number. Modify DRIQueryVersion to return the libdri version
2961fe5e51b7Smrg        number, which all DDXes were requesting implicitly. Fix the DDXes to
2962fe5e51b7Smrg        check for the DRIINFO version they were compiled against.
2963fe5e51b7Smrg
2964fe5e51b7Smrgcommit 1b6392ffb792212016e710aaf27ffe36e5703d36
2965fe5e51b7SmrgAuthor: Daniel Stone <daniel@fooishbar.org>
2966fe5e51b7SmrgDate:   Wed Apr 20 12:25:28 2005 +0000
2967fe5e51b7Smrg
2968fe5e51b7Smrg    Fix includes right throughout the Xserver tree:
2969fe5e51b7Smrg    change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
2970fe5e51b7Smrg    change "foo.h", "extensions/foo.h" and "X11/foo.h" to
2971fe5e51b7Smrg        <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
2972fe5e51b7Smrg    change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2973fe5e51b7Smrg
2974fe5e51b7Smrgcommit 58e70eb5ef3b0a2d4ac2950c45670a660691b1f6
2975fe5e51b7SmrgAuthor: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
2976fe5e51b7SmrgDate:   Sat Dec 4 00:43:09 2004 +0000
2977fe5e51b7Smrg
2978fe5e51b7Smrg    Encoding of numerous files changed to UTF-8
2979fe5e51b7Smrg
2980fe5e51b7Smrgcommit 99eab59d167595a7deefc55b2c3226bc861a4986
2981fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
2982fe5e51b7SmrgDate:   Mon Aug 16 09:13:14 2004 +0000
2983fe5e51b7Smrg
2984fe5e51b7Smrg    Bug #1087: Make sure all the *Weak symbols are documented in the import
2985fe5e51b7Smrg        list, so the loader knows not to complain about unresolved symbols when
2986fe5e51b7Smrg        an optional module isn't loaded. This typically manifests as warnings
2987fe5e51b7Smrg        about fbdevHW symbols when the user isn't using the framebuffer
2988fe5e51b7Smrg        console.
2989fe5e51b7Smrg
2990fe5e51b7Smrgcommit f29f2239d31232e152744321c447035ede658ce2
29911e423a8fSmrgAuthor: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
2992fe5e51b7SmrgDate:   Fri Aug 13 18:24:08 2004 +0000
2993fe5e51b7Smrg
2994fe5e51b7Smrg    Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
2995fe5e51b7Smrg    Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
2996fe5e51b7Smrg        Harris.
2997fe5e51b7Smrg    Call xf86EnableDisableFBAccess though the function pointer instead of
2998fe5e51b7Smrg        directly. #1041, Patch from Aaron Plattner.
2999fe5e51b7Smrg    Swap the phsyical size of the screen when rotiation. #1050, Patch from
3000fe5e51b7Smrg        Aaron Plattner.
3001fe5e51b7Smrg    Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
3002fe5e51b7Smrg    Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
3003fe5e51b7Smrg        of proping it. This way it will work with the monolithic version too.
3004fe5e51b7Smrg        #1062, Patch by Owen Taylor.
3005fe5e51b7Smrg
3006fe5e51b7Smrgcommit d9e1c04184e016604a9c84d53970c783f0849d2a
3007fe5e51b7SmrgAuthor: Kevin E Martin <kem@kem.org>
3008fe5e51b7SmrgDate:   Mon Aug 9 22:37:22 2004 +0000
3009fe5e51b7Smrg
3010fe5e51b7Smrg    Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
3011fe5e51b7Smrg        Harold L. Hunt II, Alexander Gottwald).
3012fe5e51b7Smrg    Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
3013fe5e51b7Smrg        David Dawes).
3014fe5e51b7Smrg    Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
3015fe5e51b7Smrg    HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
3016fe5e51b7Smrg    Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
3017fe5e51b7Smrg    Fix attempt to read video ROM before enabling it (Bug #843, Ivan
3018fe5e51b7Smrg        Kokshaysky, Mike A. Harris).
3019fe5e51b7Smrg    Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
3020fe5e51b7Smrg        Harris).
3021fe5e51b7Smrg    Clarify xset man page description of how to use the keyboard repeat rate
3022fe5e51b7Smrg        settings (Bug #846, Mike A. Harris).
3023fe5e51b7Smrg    Fix problem where print-screen key would get remapped to sys-req in certain
3024fe5e51b7Smrg        keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
3025fe5e51b7Smrg        Taylor).
3026fe5e51b7Smrg    Fix several render problems:
3027fe5e51b7Smrg    - MMIO mode support
3028fe5e51b7Smrg    - Hang on IGP chips
3029fe5e51b7Smrg    - VT switching hang
3030fe5e51b7Smrg    - 3D render corruption (Bug #922, Hui Yu).
3031fe5e51b7Smrg
3032fe5e51b7Smrgcommit 7043429714bbe667f74ead4e5f3465e27695c996
3033fe5e51b7SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr>
3034fe5e51b7SmrgDate:   Tue Aug 3 08:52:16 2004 +0000
3035fe5e51b7Smrg
3036fe5e51b7Smrg    Fix declaration of XAACachePlanarMonoStippleProc. Rename
3037fe5e51b7Smrg        XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for
3038fe5e51b7Smrg        consistency with other parts of xaa and fix forward declaration in
3039fe5e51b7Smrg        xaalocal.h. Fixes last comments on Bug #962.
3040fe5e51b7Smrg
3041fe5e51b7Smrgcommit a44da97b743cf5f131bb6a7709ba72e30701be8b
3042fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
3043fe5e51b7SmrgDate:   Tue Aug 3 02:44:21 2004 +0000
3044fe5e51b7Smrg
3045fe5e51b7Smrg    Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
3046fe5e51b7Smrg        DoLoadableServer NO builds work again.
3047fe5e51b7Smrg
3048fe5e51b7Smrgcommit 4db80992d38311deaefdbe5da1c41b2c14102e1a
3049fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
3050fe5e51b7SmrgDate:   Sat Jul 31 01:21:18 2004 +0000
3051fe5e51b7Smrg
3052fe5e51b7Smrg    Change several LoaderSymbol calls introduced by the bug #400 patch to
3053fe5e51b7Smrg    *Weak() resolver functions.
3054fe5e51b7Smrg
3055fe5e51b7Smrgcommit dd173d29d2c2bd73bea8eef018b1c6dd6b7a967c
3056fe5e51b7SmrgAuthor: Adam Jackson <ajax@nwnk.net>
3057fe5e51b7SmrgDate:   Fri Jul 30 20:30:52 2004 +0000
3058fe5e51b7Smrg
3059fe5e51b7Smrg    Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
3060fe5e51b7Smrg        framebuffer formats except cfb and the overlay modes should work, and
3061fe5e51b7Smrg        r128 and radeon need to be loaded from the ati driver (both issues to
3062fe5e51b7Smrg        be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
3063fe5e51b7Smrg        drivers. elfloader users shouldn't be affected.
3064fe5e51b7Smrg
3065fe5e51b7Smrgcommit e12aa54892259cdfef7c0f9419b58f0b9d4163d7
3066fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3067fe5e51b7SmrgDate:   Fri Jul 30 18:40:36 2004 +0000
3068fe5e51b7Smrg
3069fe5e51b7Smrg    Fixed typo in a comment.
3070fe5e51b7Smrg    Deleted bogus comment.
3071fe5e51b7Smrg    Added debugging support.
3072fe5e51b7Smrg
3073fe5e51b7Smrgcommit 4f86d37662c0fe3f27a886f7947e009235103e6b
3074fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com>
3075fe5e51b7SmrgDate:   Tue Jul 27 02:55:47 2004 +0000
3076fe5e51b7Smrg
3077fe5e51b7Smrg    - add mga_maven.h; needed for mga maven support (Ryan Underwood)
3078fe5e51b7Smrg
3079fe5e51b7Smrgcommit 9ae7f9446d049a1fad550f5f681bc557de158c10
3080fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com>
3081fe5e51b7SmrgDate:   Tue Jul 27 02:50:41 2004 +0000
3082fe5e51b7Smrg
3083fe5e51b7Smrg    - enable maven support for TV detection, DPMS, and DDC on crtc2 on G400
3084fe5e51b7Smrg        (Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098)
3085fe5e51b7Smrg    - expose I2CStart; needed for mga maven support (Ryan Underwood)
3086fe5e51b7Smrg
3087fe5e51b7Smrgcommit 8b030a847771f6b34bf38913eb6b53543f320f29
3088fe5e51b7SmrgAuthor: Alex Deucher <agd5f@yahoo.com>
3089fe5e51b7SmrgDate:   Mon Jul 26 23:14:37 2004 +0000
3090fe5e51b7Smrg
3091fe5e51b7Smrg    - Add Radeon DynamicClocks option
3092fe5e51b7Smrg    - Add small fixes and clean ups from ati's last code drop (typo_fixes,
3093fe5e51b7Smrg        remove_fudge, laptop, xvfix)
3094fe5e51b7Smrg    - fix possible segfault in mga_dri.c (Ryan Underwood)
3095fe5e51b7Smrg    - Add Xv support to pre-nm2160 neomagic chipsets
3096fe5e51b7Smrg
3097fe5e51b7Smrgcommit e9a123f08880882a519b6eba8305d62ac375ca10
3098fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org>
3099fe5e51b7SmrgDate:   Wed Jun 16 09:44:00 2004 +0000
3100fe5e51b7Smrg
3101fe5e51b7Smrg    Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
3102fe5e51b7Smrg        with the following notes:
3103fe5e51b7Smrg    - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
3104fe5e51b7Smrg        insecurity.
3105fe5e51b7Smrg    - VIA driver converted to new drmContext and drmHandle names.
3106fe5e51b7Smrg    - Radeon driver merge conflicted in many places, and MergedFB at least
3107fe5e51b7Smrg        could probably use some checking at this point.
3108fe5e51b7Smrg
3109fe5e51b7Smrgcommit 1ca2311bee53e99b49a860862e4010e58c918585
3110fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org>
3111fe5e51b7SmrgDate:   Wed Jun 16 09:26:24 2004 +0000
3112fe5e51b7Smrg
3113fe5e51b7Smrg    DRI trunk-20040613 import
3114fe5e51b7Smrg
3115fe5e51b7Smrgcommit 7cbb9f870b020742a254f1e9aadd0209b1f0a876
3116fe5e51b7SmrgAuthor: Eric Anholt <anholt@freebsd.org>
3117fe5e51b7SmrgDate:   Wed Jun 16 09:23:24 2004 +0000
3118fe5e51b7Smrg
3119fe5e51b7Smrg    DRI XFree86-4_3_99_12-merge import
3120fe5e51b7Smrg
3121fe5e51b7Smrgcommit 9dd51de1d530c6081333d30f945afb6d9208a77f
3122fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3123fe5e51b7SmrgDate:   Fri Apr 23 19:38:38 2004 +0000
3124fe5e51b7Smrg
3125fe5e51b7Smrg    Merging XORG-CURRENT into trunk
3126fe5e51b7Smrg
3127fe5e51b7Smrgcommit f02d171b227e657f02a0b99a28cff7cbda21a583
3128fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3129fe5e51b7SmrgDate:   Sun Mar 14 08:33:25 2004 +0000
3130fe5e51b7Smrg
3131fe5e51b7Smrg    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
3132fe5e51b7Smrg
3133fe5e51b7Smrgcommit d8072750f830173e3c9eefae8364d12190b20c26
3134fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3135fe5e51b7SmrgDate:   Wed Mar 3 12:12:19 2004 +0000
3136fe5e51b7Smrg
3137fe5e51b7Smrg    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
3138fe5e51b7Smrg
3139fe5e51b7Smrgcommit ddb58a6e1be274dce96cc7c29965a45c2294c5d3
3140fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3141fe5e51b7SmrgDate:   Thu Feb 26 13:35:53 2004 +0000
3142fe5e51b7Smrg
3143fe5e51b7Smrg    readding XFree86's cvs IDs
3144fe5e51b7Smrg
3145fe5e51b7Smrgcommit 0d050fbd293089d93bd78b58b1b454dc2ced8cdf
3146fe5e51b7SmrgAuthor: Egbert Eich <eich@suse.de>
3147fe5e51b7SmrgDate:   Thu Feb 26 09:23:19 2004 +0000
3148fe5e51b7Smrg
3149fe5e51b7Smrg    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
3150fe5e51b7Smrg
3151fe5e51b7Smrgcommit 64c0cb99b62c87052374f63d3e31e2603eab2f9c
3152fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org>
3153fe5e51b7SmrgDate:   Mon Feb 23 20:35:03 2004 +0000
3154fe5e51b7Smrg
3155fe5e51b7Smrg    Import most of XFree86 4.4RC3. This import excludes files which have the
3156fe5e51b7Smrg        new license. If we want to, later we can import 4.4RC3 again and pick
3157fe5e51b7Smrg        up the files that have the new license, but for now the vendor branch
3158fe5e51b7Smrg        is "pure."
3159fe5e51b7Smrg
3160fe5e51b7Smrgcommit bf37df17ecf040836ad8924a9174787d0f57ed5a
3161fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org>
3162fe5e51b7SmrgDate:   Tue Nov 25 19:28:37 2003 +0000
3163fe5e51b7Smrg
3164fe5e51b7Smrg    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
3165fe5e51b7Smrg
3166fe5e51b7Smrgcommit d3b3c858814952bc7344a4154e981851fd9bb494
3167fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org>
3168fe5e51b7SmrgDate:   Fri Nov 14 16:48:55 2003 +0000
3169fe5e51b7Smrg
3170fe5e51b7Smrg    XFree86 4.3.0.1
3171fe5e51b7Smrg
3172fe5e51b7Smrgcommit 1e444800e5935c1c5678aaa9fa3751c4519f42e4
3173fe5e51b7SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org>
3174fe5e51b7SmrgDate:   Fri Nov 14 16:48:55 2003 +0000
3175fe5e51b7Smrg
3176fe5e51b7Smrg    Initial revision
3177