summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2022-12-04 18:15:10 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2022-12-04 18:15:10 +0000
commit4dd047832bea93083ac1e889f393e286a1221296 (patch)
treeff3a5b706b46e3798fd99d011cccefe9e5e83cb0
parent9e5cdf5700982f548fbff7a5db98c46aa0808884 (diff)
Update xf86-video-mach64 to version 6.9.7.
Diffstat
-rw-r--r--driver/xf86-video-mach64/ChangeLog318
-rw-r--r--driver/xf86-video-mach64/Makefile.in7
-rw-r--r--driver/xf86-video-mach64/README25
-rw-r--r--driver/xf86-video-mach64/aclocal.m4207
-rw-r--r--driver/xf86-video-mach64/compile14
-rwxr-xr-xdriver/xf86-video-mach64/configure147
-rw-r--r--driver/xf86-video-mach64/configure.ac19
-rw-r--r--driver/xf86-video-mach64/man/Makefile.in1
-rw-r--r--driver/xf86-video-mach64/src/Makefile.in1
-rw-r--r--driver/xf86-video-mach64/src/aticonfig.c8
-rw-r--r--driver/xf86-video-mach64/src/atidri.c2
-rw-r--r--driver/xf86-video-mach64/src/atidri.h2
-rw-r--r--driver/xf86-video-mach64/src/atimach64io.h4
-rw-r--r--driver/xf86-video-mach64/src/atimach64render.c55
-rw-r--r--driver/xf86-video-mach64/src/atimach64xv.c2
-rw-r--r--driver/xf86-video-mach64/src/atiscreen.c2
-rw-r--r--driver/xf86-video-mach64/src/ativgaio.h2
-rw-r--r--driver/xf86-video-mach64/src/atividmem.c2
18 files changed, 475 insertions, 343 deletions
diff --git a/driver/xf86-video-mach64/ChangeLog b/driver/xf86-video-mach64/ChangeLog
index ceb2c9452..273852cd5 100644
--- a/driver/xf86-video-mach64/ChangeLog
+++ b/driver/xf86-video-mach64/ChangeLog
@@ -1,3 +1,91 @@
+commit 74cc25c7c54bf2b2f036fd50f66f9071953db24f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jul 10 16:58:49 2022 -0700
+
+ xf86-video-mach64 6.9.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fe76415fe3935e6ea9e27a79d0cb650e7d93ee97
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jan 22 12:30:21 2022 -0800
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3ab2c144ef34199ceaf95115538a67f932e76f7d
+Author: Josselin Poiret <dev@jpoiret.xyz>
+Date: Thu Nov 18 13:18:25 2021 +0000
+
+ Rename bool to boolean for OptionInfoRec.
+
+ * src/aticonfig.c: Change uses of .value.bool to .value.boolean
+
+commit 82129368107c2a0608ad350b812c07ba6e07f498
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jan 22 12:29:58 2022 -0800
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 10c2894c7164a959fc79e7844251025c04405059
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jan 22 12:25:45 2022 -0800
+
+ Build xz tarballs instead of bzip2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7c0dc184bb6f8d17ebc5bd67cee5a637d3a82ac4
+Author: George Matsumura <gmmatsumura01@bvsd.org>
+Date: Sun Oct 6 17:43:24 2019 +0000
+
+ Fix debugging traces
+
+ Without this change, the compiler emits an error about pPict being undefined when fallback messages are turned on.
+
+commit fbe3995a27bdd81701dbb3b5e26556a00cfdf1d3
+Author: George Matsumura <gmmatsumura01@bvsd.org>
+Date: Tue Dec 24 06:12:01 2019 +0000
+
+ Fix compositing rotation
+
+ This corrects the composite operation's interpretation of a
+ source picture transformation matrix indicating rotation,
+ correcting a previous behavior where the source image was simply
+ flipped and not rotated. This is done by using a transformed vector
+ for each vertex of the source rectangle, instead of just two at
+ each of the diagonally opposed corner vertices.
+
+commit 37498721a520cd1cff367bc36b1ac74b343826ca
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Jul 5 11:01:56 2019 +0200
+
+ configure: Include xorg-server.h before exa.h
+
+ Fixes EXA detection spuriously failing with current xserver.
+
+commit 39191361f0c80e57504fa91cc12d2b36b6460630
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 25 14:00:27 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3df130663fdca112eff567bde4421c5616e7a6b8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 18 13:22:41 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit a504b15fc74f7725f67866e22407b742d1d435a9
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 18 12:49:30 2018 -0400
@@ -1028,7 +1116,7 @@ Date: Fri Feb 22 17:05:56 2008 -0500
ATOM: properly set up DDIA output on RS6xx boards
commit 1d0e9ab8b9451101b1b91943546f6c5833c21b3f
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Feb 20 10:21:49 2008 +0100
radeon: Fix typo flagged by gcc -Wall.
@@ -1645,7 +1733,7 @@ Date: Thu Jan 10 14:49:48 2008 -0500
RADEON: clean up output handling
commit 10e7636c02478b8ffe183bb0c46229ca0d6584e1
-Author: Kristian Høgsberg <krh@bitplanet.net>
+Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jan 9 12:47:39 2008 -0500
RADEON: fix crtc routing on r4xx cards when using atom to init DVO chip
@@ -1738,13 +1826,13 @@ Date: Thu Jan 3 15:47:50 2008 -0500
See bug 12129
commit c652208861bffca94f06b7f67688ce220e050bfb
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jan 3 17:54:58 2008 +0100
radeon: Adapt manpage to reality wrt AGP options.
commit ab451e4b7a5423d61b57cf0646599267d8504af4
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jan 3 17:52:39 2008 +0100
radeon: Miscellaneous warning fixes.
@@ -2192,7 +2280,7 @@ Date: Sat Dec 15 20:51:53 2007 -0500
RADEON: clean up units in PLL calculation
commit b653e5a628bfa4dfb168e96f93f41eb910f409fb
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 15 00:50:10 2007 +0100
radeon: Default to 1x again with non-v3 AGP cards.
@@ -2201,7 +2289,7 @@ Date: Sat Dec 15 00:50:10 2007 +0100
crossed...
commit 6229825fa5d6715569098afbb21a40f7a2e7e6be
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 15 00:48:26 2007 +0100
radeon: Warning fixes.
@@ -2210,7 +2298,7 @@ Date: Sat Dec 15 00:48:26 2007 +0100
though...
commit 818ccf0fd4b5879171c5f20526d5a58638f8fde5
-Author: Fredrik Höglund <fredrik@kde.org>
+Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri Dec 14 23:56:12 2007 +0100
RADEON: Fix the vertex coordinates for transformed pictures
@@ -2393,7 +2481,7 @@ Date: Fri Dec 7 09:45:05 2007 +0100
radeon: Use %u instead of %d for unsigned value.
commit df44f8380268c27d3978c4e91d736f093322b8b8
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Dec 7 09:41:47 2007 +0100
radeon: Use gettimeofday instead of xf86getsecs.
@@ -2459,13 +2547,13 @@ Date: Tue Dec 4 17:08:58 2007 -0500
Thanks to Étienne Bersac for helping to figure this out.
commit 54bfd522405d9fdfb69d3a59e111ac3d63483dbb
-Author: Étienne Bersac <bersace03@laposte.net>
+Author: Étienne Bersac <bersace03@laposte.net>
Date: Tue Dec 4 14:22:42 2007 -0500
RADEON: fix typo
commit 5022d006cfc06ca0395981526b2c2c94c6878567
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 2 17:27:33 2007 +0100
radeon: Further XVideo fixes.
@@ -2482,7 +2570,7 @@ Date: Sun Dec 2 17:18:46 2007 +0100
See https://bugs.freedesktop.org/show_bug.cgi?id=13274 .
commit a697b590899bb7704ec4d7ae9a9c3cbbfcaef382
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 2 17:11:20 2007 +0100
Fix build against xserver master.
@@ -3394,7 +3482,7 @@ Date: Tue Nov 6 18:04:43 2007 -0500
some things.
commit 37af2f6b52c8f217b205486742a6b46a864da8ed
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 5 10:58:25 2007 +0100
radeon: Use indirect register access for (un)hiding the cursor.
@@ -3403,13 +3491,13 @@ Date: Mon Nov 5 10:58:25 2007 +0100
busy with some cards.
commit 5659e2f1b08e44d0c4f21a403e91b4801ef78f62
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 5 10:32:04 2007 +0100
radeon: Fix build warning on powerpc.
commit d41d73f5f9d8baee7137e94da2c7852ea0412180
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 5 10:30:23 2007 +0100
Revert "radeon: Reinstate sync in radeon_crtc_show/hide_cursor."
@@ -3523,7 +3611,7 @@ Date: Tue Oct 16 18:54:28 2007 -0400
with RMX.
commit 93561688087493fccb7ac387d728feec61212180
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Oct 16 10:57:06 2007 +0200
radeon: Handle 64 bit PCI resource bases better.
@@ -3559,7 +3647,7 @@ Date: Mon Oct 15 20:06:28 2007 -0400
mode bugs.
commit fd5bb7bb5e968127b87102320eccc1222f205e5a
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Oct 13 18:56:43 2007 +0200
radeon: Improve detection of default value for Option "MacModel" on Linux.
@@ -3711,13 +3799,13 @@ Date: Fri Oct 5 20:05:54 2007 -0400
fixes bug 12048
commit abbafe6db7c0d24efc61a05950d4214c00d3f043
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:33:09 2007 +0200
radeon: Fix compile warnings.
commit 1110957ba703475847b8e72023c6edcbd1068aef
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:32:48 2007 +0200
radeon: Fix for pci-rework.
@@ -3726,7 +3814,7 @@ Date: Thu Oct 4 11:32:48 2007 +0200
commit 7addf41885ec5658f531624a9c24ea5bd7d22d19
Merge: 3a958ba 78c6bd3
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:06:08 2007 +0200
Merge remote branch 'origin/pci-rework'
@@ -3834,7 +3922,7 @@ Date: Fri Sep 28 14:50:42 2007 +1000
rc410: disable DRI by default due to it not working
commit 4d9f944e40c6b9ac7e80428dff49c6e83fda1d8f
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 17:50:15 2007 +0200
radeon: Fix build on little endian platforms.
@@ -3843,7 +3931,7 @@ Date: Thu Sep 27 17:50:15 2007 +0200
directly.
commit 5902e913010a2fb0c17efe01f9aade73f9646f16
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 12:53:34 2007 +0200
radeon: EXA pitch fixes.
@@ -3858,7 +3946,7 @@ Date: Thu Sep 27 12:53:34 2007 +0200
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12551 .
commit ca728973bce504e03bf6228d18287906c35eaa3f
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 11:14:21 2007 +0200
radeon: Don't use pixmap data pointer directly with EXA.
@@ -3946,7 +4034,7 @@ Date: Sat Sep 22 15:11:20 2007 -0400
LVDS + RMX doesn't seem to like having the crtc values tweaked.
commit 9109e62e3be7f96b41b534ab517fdf1baf458806
-Author: Michel Dänzer <daenzer@debian.org>
+Author: Michel Dänzer <daenzer@debian.org>
Date: Sat Sep 22 14:19:10 2007 -0400
RADEON: fix crash when Xv window is outside of either crtc
@@ -4040,7 +4128,7 @@ Date: Tue Sep 18 20:12:21 2007 -0400
some chips seem to be pickier than others. fixes bug 12467
commit 8a84dc8ee260716026fa661a6dced2000621efa2
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Sep 18 11:53:39 2007 +0200
radeon: Remove declaration of unused variable.
@@ -4114,7 +4202,7 @@ Date: Mon Sep 10 19:00:16 2007 +0300
compile-tested only.
commit 0241cac643fa1c08a45ea44f5c670b290e760ad8
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Sep 8 00:22:40 2007 +0200
radeon: Reinstate sync in radeon_crtc_show/hide_cursor.
@@ -4138,7 +4226,7 @@ Date: Thu Aug 30 11:40:13 2007 +0200
radeon: Fix Option "MacModel".
commit 2b860726fff058623e0e8e1b0aca092c246875ce
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 11:38:28 2007 +0200
radeon: Don't build currently unused RADEONSavePalette.
@@ -4289,13 +4377,13 @@ Date: Fri Aug 24 20:42:13 2007 -0400
Apparently some radeons need this?
commit 71f650d1bc432514516f7ac64a5e8a54c5227881
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 09:21:39 2007 +0200
Require xorg-server >= 1.3 for RandR 1.2.
commit d7230939f523610c57f92bdfc72966bdbc6f1070
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 09:21:14 2007 +0200
64 bit warning fixes.
@@ -4341,13 +4429,13 @@ Date: Thu Aug 23 18:51:34 2007 -0400
LVDS (via bios table or otherwise) assume it's connected.
commit b0f170c5f736ecba1a5899d602c4173fe9b9b1fa
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 12:55:40 2007 +0200
radeon: Remove unnecessary #include <time.h>.
commit ac54c0e4360099697755d14b1030def73d8235b0
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 22 14:33:59 2007 +0200
radeon: Warning fixes.
@@ -4378,7 +4466,7 @@ Date: Thu Aug 23 12:11:51 2007 +0200
https://bugs.freedesktop.org/show_bug.cgi?id=8983 .
commit 633c1fff10a3be4c9f48c1995e330d60bf6abbb2
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 12:11:41 2007 +0200
radeon: Sync pages when enabling page flipping with EXA as well.
@@ -4386,31 +4474,31 @@ Date: Thu Aug 23 12:11:41 2007 +0200
Exclude the DRI window(s) though to avoid scribbling over 3D rendering.
commit 4f8010ce22043c0f8d60c0f49d270ce98c9d2466
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 12:11:12 2007 +0200
radeon: Don't synchronize DRI windows between pages when possible.
commit 7b527054a7c81d1d1dbc79d41b9e53064dab68cb
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 12:10:33 2007 +0200
radeon: Restore memmap registers even if only AGP location changed.
commit d7ba9f001c0ab645984526afd0e64d1c6a6d654a
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 11:39:54 2007 +0200
radeon: Change a test to info->IsIGP from several IGP families.
commit 8c7c22e22b6076abc80e4e1aaa8d1f4cf2f3ed14
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 11:38:17 2007 +0200
radeon: Wait for pending overlay flip to finish before emitting new one.
commit 92fa7cc00688d7bfc1fb72e645ac30c6d92669c6
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 23 11:38:16 2007 +0200
radeon: Don't call RADEONDRIRefreshArea when the damaged region is empty.
@@ -4423,13 +4511,13 @@ Date: Thu Aug 23 18:46:41 2007 +1000
(cherry picked from commit 3334c247540b113f9c4a5ce1879d8648a45a959a)
commit 9d6261c024c697a211da4b6300420153eb72a264
-Author: Roland Bär <roland@verifysoft.de>
+Author: Roland Bär <roland@verifysoft.de>
Date: Thu Aug 23 18:33:34 2007 +1000
radeon: bug 11860 fix some mem leaks
commit 7bc1f862bc5f992f213143fbafef52459ba7db4a
-Author: Roland Bär <roland@verifysoft.de>
+Author: Roland Bär <roland@verifysoft.de>
Date: Thu Aug 23 18:37:35 2007 +1000
radeon: bug 11861 - dead code removal in radeon_video.c
@@ -4959,7 +5047,7 @@ Date: Thu Jul 5 20:04:04 2007 -0400
fixes bug 11357
commit ac9cbaf32176cf144bc694ac879e7c9e2920f762
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 2 10:06:02 2007 +0200
radeon: Fully zero-initialize info->CRT2pScrn->monitor.
@@ -5136,7 +5224,7 @@ Date: Tue Jun 12 23:41:24 2007 -0400
RADEON: additional LVDS off fix (missed in previous commit)
commit 9fc416ce08cc5d74faa7b184e80ce43ed2f4fbee
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jun 12 23:35:09 2007 -0400
radeon: Fix panel size detection from registers with stretched mode programmed.
@@ -5174,19 +5262,19 @@ Date: Tue Jun 12 23:20:18 2007 -0400
- fixes bug 3483
commit c6a3286d6f6ddda89115d98d45665dadd78bf41d
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:39:38 2007 +0200
radeon: Fix panel size detection from registers with stretched mode programmed.
commit 7a6b3c0f77c69019268f585c51c3dcbcc99014d4
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:39:38 2007 +0200
radeon: Don't loop indefinitely if no mode matches detected panel size.
commit f31fd9ce598841c505a0b5ed32bf124f49fea332
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:39:38 2007 +0200
radeon: Fix some more ErrorFs when setting mode.
@@ -5311,7 +5399,7 @@ Date: Thu May 31 22:23:57 2007 -0600
Fix build whithout XF86DRI
commit 0e0946e0aa2527794e07473199e851bbfbc47cb1
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed May 30 18:56:53 2007 +0200
radeon: Lots of warning fixes.
@@ -5490,7 +5578,7 @@ Date: Wed May 23 21:18:40 2007 -0400
RADEON: add output properties (not functional yet)
commit 975da595f032c145ad74079ff8edeaead779dc7b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:56:47 2007 +0200
radeon: Provide new DRI texOffsetStart hook when available with EXA.
@@ -5502,7 +5590,7 @@ Date: Tue May 22 00:09:46 2007 -0400
RADEON: Only add valid connectors
commit 8275151baac22c34149cef0b7d922771d24abc3e
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon May 21 10:25:48 2007 +0200
radeon: HW cursor cleanup.
@@ -5515,7 +5603,7 @@ Date: Mon May 21 10:25:48 2007 +0200
the CRTC registers.
commit 137e3fc1899078af0f72303ab0a4e6cf35804a7b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon May 21 10:25:48 2007 +0200
radeon: Suppress debugging output by default.
@@ -6001,7 +6089,7 @@ Date: Mon Apr 9 22:08:31 2007 +1000
2D now.
commit 6b25a4c48796e022a093f3072574ffe9709ecaf4
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 4 10:47:29 2007 +0200
radeon: Link nearest modes by default for clone mode.
@@ -6010,7 +6098,7 @@ Date: Wed Apr 4 10:47:29 2007 +0200
MergedFB.
commit 3c892f163ec1fa9be6e733aab091c9b718f41efc
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 4 09:52:37 2007 +0200
radeon: Always sort modes when adding to list.
@@ -6018,7 +6106,7 @@ Date: Wed Apr 4 09:52:37 2007 +0200
This makes sure mode lists will always be sorted from larger to smaller.
commit 3a8190ccc79969925257e7b980b78d79053d208d
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 4 09:47:07 2007 +0200
radeon: Don't shrink virtual size based on secondary modes.
@@ -6036,7 +6124,7 @@ Date: Sat Mar 31 20:10:03 2007 -0800
9337: EDID modes do not participate in validation for CRT monitor
commit 1acd6d6fa42acec07fb11aeb189f492ddb021cb4
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Mar 30 11:06:10 2007 +0200
radeon: Guard some MergedFB specific code with info->MergedFB tests.
@@ -6044,7 +6132,7 @@ Date: Fri Mar 30 11:06:10 2007 +0200
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10442 .
commit 1a71106c0e4fe5f650239dc694163fdf52d33663
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 27 10:13:21 2007 +0200
radeon: Fix typo.
@@ -6202,7 +6290,7 @@ Date: Sun Mar 18 15:35:25 2007 +0200
it should be handled with a CPIO driver anyway.
commit 166c760a86165330175023e07c4b2bd6891633c5
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:16:02 2007 +0100
Fix advertised minimum minor version of the DRI module.
@@ -6210,7 +6298,7 @@ Date: Tue Mar 20 09:16:02 2007 +0100
We don't automatically require bumped minor versions.
commit 1bdd376dbd57de8925244f0808f974d6d8cff39d
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:14:39 2007 +0100
radeon: Only sync to hardware when really necessary with EXA.
@@ -6220,13 +6308,13 @@ Date: Tue Mar 20 09:14:39 2007 +0100
which can be relevant in some situations.
commit 3cfa3a5c8daf03aaad6fc30d275709f6eb717d29
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:13:24 2007 +0100
radeon: Unify code to release the CP.
commit e174d8df8c801fad95e5f79cff69187c200bee6e
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:12:51 2007 +0100
radeon: Minor BlockHandler cleanups.
@@ -6236,7 +6324,7 @@ Date: Tue Mar 20 09:12:51 2007 +0100
Also set the EXA engine mode to unknown only at the end.
commit 113fb4b61e709a9b54fc2ef73efce06011e771c1
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:12:09 2007 +0100
radeon: Disable CP line acceleration on RV280s.
@@ -6245,7 +6333,7 @@ Date: Tue Mar 20 09:12:09 2007 +0100
xscreensaver hack hypercube.
commit 4651d00b183cb498879d605c4b93cd3a0c63cb33
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 20 09:10:19 2007 +0100
radeon: Make sure 3D clients will re-upload textures to video RAM after LeaveVT.
@@ -6254,13 +6342,13 @@ Date: Tue Mar 20 09:10:19 2007 +0100
will consider them kicked out when they grab the HW lock next time.
commit 2d2fb54ba370c1df9ef5102e83c17a7ff5c55403
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Mar 15 17:26:56 2007 +0100
atimisc: Fix strict aliasing violation flagged by -Wall.
commit cfb82631fb683a0dc9bbc8f2d214646a8f1bca0b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Mar 15 17:12:43 2007 +0100
radeon: Fix build warnings.
@@ -7023,7 +7111,7 @@ Date: Tue Dec 19 09:45:24 2006 +0200
Use portable XORG_RELEASE_VERSION macro.
commit 97df0a32b14e34f22dce9cd3b375c1ac5fb1c5eb
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 11:28:21 2006 +0100
radeon: Advertise 2D engine limits to EXA when we're not using the 3D engine.
@@ -7031,7 +7119,7 @@ Date: Tue Dec 19 11:28:21 2006 +0100
Also round up to the maximum width and height, as that's what EXA compares.
commit 295823d0879a5b574bb79843a6acd43adb9259e5
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 11:19:20 2006 +0100
radeon: Default to leaving AGP transfer mode and fast writes unchanged.
@@ -7137,7 +7225,7 @@ Date: Fri Dec 8 02:51:52 2006 +0100
affected may suffer from other slowness issues too.
commit ccd37b3e88cdcfe03b7c707b6082339eb8f11e6b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Dec 7 18:41:48 2006 +0100
radeon: Move Xv option handling code into RADEONPreInitXv().
@@ -7146,7 +7234,7 @@ Date: Thu Dec 7 18:41:48 2006 +0100
against info->ChipFamily after that's initialized.
commit 02be8c04a268eaa71bdfe891331758715fef4e71
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Dec 7 18:31:58 2006 +0100
radeon: Make cache flushing for R300 series less invasive.
@@ -7155,7 +7243,7 @@ Date: Thu Dec 7 18:31:58 2006 +0100
into the CP stream.
commit be46f7b6f7a729695a0affe2328077666283af12
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Dec 7 16:27:10 2006 +0100
Fix radeon compile warnings.
@@ -7284,13 +7372,13 @@ Date: Sat Dec 2 19:16:41 2006 +1100
move HasCRTC2 to pRADEONEnt from info
commit 3933b86390eb2f4198d490acd4914fb470c40f47
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Dec 1 18:00:17 2006 +0100
Make log file output clear about origin of used overlay scaler buffer width.
commit 563dfb52f5b24d2f765fae0394e599c11dcf0b5b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Dec 1 17:56:19 2006 +0100
Increase default overlay scaler buffer width for RV350.
@@ -7298,7 +7386,7 @@ Date: Fri Dec 1 17:56:19 2006 +0100
Works with 1920x1080 video on my M10.
commit 984ea3d9b7c27d8183ca94ad9d7905f03613fe10
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Dec 1 17:42:23 2006 +0100
Fix build warning.
@@ -7346,14 +7434,14 @@ Date: Wed Nov 22 13:38:01 2006 -0500
on any laptops at the moment anyway.
commit e4850610596a08082a528c38186268b72012e78c
-Author: Alain Péteut <alain.peteut@gmx.ch>
+Author: Alain Péteut <alain.peteut@gmx.ch>
Date: Wed Nov 22 12:54:55 2006 -0500
enable i2c for PCI_CHIP_RV250_If. allows AIW fuctionality to work.
patch and testing from Alain Péteut
commit ff38c2c9cf0c6acbdaf53b681ec721487cf411f8
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Nov 19 17:11:46 2006 +0100
radeon: Bug #8989: Fix page flipping artifacts with XAA.
@@ -7363,7 +7451,7 @@ Date: Sun Nov 19 17:11:46 2006 +0100
were last synced.
commit 2dd0892817090709b2fb7ffba920595ada00fcad
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Nov 19 17:09:11 2006 +0100
Fix compile warnings.
@@ -7452,7 +7540,7 @@ Date: Mon Oct 23 16:52:07 2006 +1000
radeon: set preferred modes
commit 914a5f0117ccb76292bdd81ea4a2a79d33319550
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 23 10:13:24 2006 +0200
radeon: Pitch doesn't matter when height == 1.
@@ -7515,13 +7603,13 @@ Date: Sun Oct 15 13:10:22 2006 -0400
it won't be an issue anyway.
commit 2933140b5f1f8a6e270460d8918a14943bd0f174
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 17:05:02 2006 +0200
radeon: Use xf86XVFillKeyHelperDrawable() when available.
commit 4edbfb9eb952f9b3f5f597749192c17baf15cdce
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 17:03:13 2006 +0200
radeon: Track screen damage all the time for page flipping.
@@ -7530,7 +7618,7 @@ Date: Sun Oct 15 17:03:13 2006 +0200
never clobber one page's contents when we shouldn't.
commit c9c2ac2b42398f5bfad909f3289e2545bb7b3888
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Oct 14 15:49:22 2006 +0200
radeon: Don't try to synchronize pages when the CP isn't running.
@@ -7593,7 +7681,7 @@ Date: Sun Oct 1 18:22:14 2006 +0200
Fetch the correct displayWidth from fbdevhw after setting the mode.
commit d43ad88fa3913437f6987ab5ab46a38f0cb555a8
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Sep 30 19:25:20 2006 +0200
radeon: Add support for page flipping with EXA.
@@ -7603,7 +7691,7 @@ Date: Sat Sep 30 19:25:20 2006 +0200
tradeoff between performance and correctness.
commit 146ea328b7962f56c6ab47fbe2adc7561b36189c
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Sep 30 19:22:26 2006 +0200
radeon: Fix function name typo which could probably lead to an unresolved symbol.
@@ -7611,7 +7699,7 @@ Date: Sat Sep 30 19:22:26 2006 +0200
Also remove declaration of an unused variable.
commit 6671c1b01bf29d8f1cacf9306ef658b967d8a3cf
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Sep 30 18:29:45 2006 +0200
radeon: Always call RADEONGetAccessibleVRAM().
@@ -7631,7 +7719,7 @@ Date: Sat Sep 30 15:14:42 2006 +0200
resulting in garbage values.
commit 37c114acbabe35881c39642e293519e2635907aa
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Sep 30 15:11:42 2006 +0200
Remove some dead code.
@@ -7994,7 +8082,7 @@ Date: Tue Sep 12 07:04:23 2006 +1000
second head and it breaks mergedfb for me.
commit ad1778eb1eb59de14ec309b99131931cbccf64e9
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Sep 10 23:32:44 2006 +0200
Revert "* [ Bug 6966 ] large negative refresh rates reported"
@@ -8193,7 +8281,7 @@ Date: Sat Jul 29 00:51:53 2006 +0300
Bug #807: split out TestRegisterCaching block for DP regs.
commit fba8c839b47e2c8d6a6d65950c3431ff5b870aa0
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jul 23 18:51:47 2006 +0200
Bug #6819: Fix broken rendering with *8b8g8r8 source formats.
@@ -8218,7 +8306,7 @@ Date: Mon Jul 3 13:09:47 2006 +0200
This is a workaround for ATI Radeon 7000 erratum F1.
commit 920ac1f56fad6f48a30e65836ce054815f270738
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 3 01:21:18 2006 +0200
Do even less cache flushing when the previous engine mode is known.
@@ -8233,13 +8321,13 @@ Date: Mon Jul 3 01:10:10 2006 +0200
Bug #6762: Remove gratuitous cache flushing.
commit 22f165f290f57e638d198f24a37f62fc16b72bae
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 3 00:39:45 2006 +0200
Build and warning fixes for !defined(USE_XAA).
commit ea5105230c7c3519730b8d3c250e9ba9a4e4374a
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 3 00:03:22 2006 +0200
Reserve HW cursor memory statically instead of from EXA offscreen.
@@ -8257,13 +8345,13 @@ Date: Mon Jul 3 00:03:22 2006 +0200
register is 32 bits wide, and to avoid issues with printf.
commit 66586f905857ea5bf37cb5d34949cd450a9ed067
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jul 2 23:38:20 2006 +0200
Clean up some redundant code.
commit 1159c85861dc507ebf323aca82e32fcc67726420
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jul 2 18:24:28 2006 +0200
Bug #6548: Fix playback of interlaced video with more than 1023 lines.
@@ -8271,7 +8359,7 @@ Date: Sun Jul 2 18:24:28 2006 +0200
This will still break with 2048 lines...
commit 11bedb7c845fc6074383890d5525315aebe05f2c
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jul 2 17:03:23 2006 +0200
Bug #6939: Disable RENDER acceleration by default on RN50.
@@ -8292,19 +8380,19 @@ Date: Thu Jun 29 18:21:22 2006 +0200
Fix build for !defined(USE_EXA).
commit ee0544b670567491b7770f469a64a6cd85519ba1
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 29 18:19:58 2006 +0200
Remove unused variables.
commit 15c556f5a8c9069d3dd00ce139d46c39b7298951
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 29 18:18:21 2006 +0200
Don't declare unused variables on __powerpc__ and __alpha__.
commit 055ac2836ec0afd51cf554d043a59068c36a07d3
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 29 18:14:45 2006 +0200
Fix strict aliasing violation flagged by gcc -Wall.
@@ -8322,7 +8410,7 @@ Date: Mon Jun 26 20:34:34 2006 +1000
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit c5d8c8db3e75976687bfb364f0a7b235c7ae8793
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 16:01:19 2006 +0200
Bug #7274: Fix corruption with 'small' accelerated DownloadFromScreen transfers.
@@ -8352,7 +8440,7 @@ Date: Fri Jun 16 08:50:49 2006 +0200
conditionally declare pPCI and PciReg, too
commit a01c01787cfbe3706ae7747cde1657abd79ecdaa
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 21 09:38:47 2006 +0200
Bug #7283: Build fixes for !defined(XF86DRI).
@@ -8360,7 +8448,7 @@ Date: Wed Jun 21 09:38:47 2006 +0200
Thanks to Matthieu Herrb for pointing out some of these.
commit 79d1c573133e64ddf4446b6bb0eaab4a5a6c73ab
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jun 18 17:39:09 2006 +0200
Implement accelerated EXA DownloadFromScreen hook.
@@ -8371,13 +8459,13 @@ Date: Sun Jun 18 17:39:09 2006 +0200
the need to disable this by default with AGP.
commit 2bcdc7cfd013bd457d35f927390e5cc3544f30f1
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jun 18 16:01:00 2006 +0200
Remove #include <fbdevhw.h>, not used here.
commit 25a5ccb63a9e3074b4c8eaf48844877d84ff76bb
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jun 18 15:26:55 2006 +0200
Prefer visuals with stencil when it's hardware acclerated.
@@ -8385,13 +8473,13 @@ Date: Sun Jun 18 15:26:55 2006 +0200
Also make the formatting of the if statements consistent.
commit 8fcc436f19f9c1371295af2d0c45608fb43c584b
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jun 18 15:16:08 2006 +0200
Take part of the blame for the radeon driver.
commit c8366d7b457565a06acdf6b40c5448c7f13f1641
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Jun 18 14:24:14 2006 +0200
Add Option "DepthBits".
@@ -8417,13 +8505,13 @@ Date: Fri Jun 16 16:22:03 2006 +1000
Update some versions for release
commit 9c534b5330534fc6cf392936a9b200a5128c787c
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 16:09:55 2006 +0200
Some more ignores.
commit 3d68698647fb17a6f5ae9a225f552cb0130fa946
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 16:07:15 2006 +0200
Fix semantic glitches pointed out by gcc -Wall.
@@ -8431,20 +8519,20 @@ Date: Thu Jun 15 16:07:15 2006 +0200
The radeon driver builds warning-free with gcc -Wall here now.
commit ab2b48e0df328fd08a2412911126b3184a601aea
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 16:06:13 2006 +0200
Remove another unused variable.
commit 56bd5a370472663af5607cd327f757367b238db0
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 15:35:05 2006 +0200
Fix some more cosmetic warnings.
commit ec93e08b24f7c0e583970d08bfe18ad142e6b047
Merge: 051c49d 6ca9862
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 15:03:27 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
@@ -8463,7 +8551,7 @@ Date: Thu Jun 15 21:24:16 2006 +1000
commit 051c49d0f002c72d1d8f15f6df264d8b093d4e95
Merge: a840afc dfac819
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 13:10:44 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
@@ -8488,7 +8576,7 @@ Date: Thu Jun 15 20:59:33 2006 +1000
commit a840afc75a0453b4694e3f987ebdbddc6844a169
Merge: c90c49d d511ef4
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 12:46:58 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
@@ -8526,7 +8614,7 @@ Date: Thu Jun 15 19:58:11 2006 +1000
theatre*.[ch].
commit c90c49da3844f93d2d29070b15bb7def72b98b0f
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 10:29:46 2006 +0200
Collapse .gitignore files into single toplevel file, sorted with LC_ALL=C.
@@ -8534,13 +8622,13 @@ Date: Thu Jun 15 10:29:46 2006 +0200
Suggested by Keith Packard.
commit b7a3e4c9b33f72ae447f99c0c765f24fce988142
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 09:45:12 2006 +0200
Fix some implicit function declarations.
commit 556ddc9c41020271e92389a3900d097ec443c625
-Author: Michel Dänzer <michel@tungstengraphics.com>
+Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 09:30:43 2006 +0200
.cvsignore -> .gitignore
@@ -8783,13 +8871,13 @@ Date: Thu Mar 23 01:37:15 2006 +0000
update to a comment.
commit 673e4d7501861066fdd0874919a4524b820b944b
-Author: Kristian Høgsberg <krh@redhat.com>
+Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Mar 23 00:06:56 2006 +0000
Add atipciids.h.
commit 5dcb4152dca6ac1fe9342f44eb48c0198b15772e
-Author: Kristian Høgsberg <krh@redhat.com>
+Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Mar 22 22:30:14 2006 +0000
Convert use of xf86fopen() and other xf86 wrapped libc symbols to use libc
@@ -9308,13 +9396,13 @@ Date: Sun Oct 9 10:36:50 2005 +0000
the clients to get access to a secure area of framebuffer.
commit e526211b86ec5343002978debfcf78f74a10c69e
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Oct 4 20:01:03 2005 +0000
Check in generated README files
commit 431d0e144ae4c294e1f6110fc3db497ce9bd9cfd
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Oct 3 21:22:07 2005 +0000
- For all drivers that have a <driver>.sgml file, add code in their build
@@ -9347,7 +9435,7 @@ Date: Sat Oct 1 17:09:48 2005 +0000
add missing return value on success in RADEONSetupMemXAA().
commit 98f7d043f894c73fecaf14440c1a24b6c2fc4b06
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Sep 28 15:10:38 2005 +0000
Make ati driver distcheck
@@ -9663,7 +9751,7 @@ Date: Fri Jul 29 19:45:14 2005 +0000
some circumstances. (ATI Technologies Inc.)
commit 44a66ec5a01c3b4dfa046a66b80a3b7e9dfff537
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jul 15 15:02:47 2005 +0000
Install theathre drivers in @moduledir@/multimedia
@@ -9689,13 +9777,13 @@ Date: Thu Jul 14 19:35:48 2005 +0000
sdk headers. Expand help string for xorg-module-dir option.
commit ab5264838ae34bb29791bc08d5a4f853a995faf1
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 17:10:01 2005 +0000
fuck you cvs
commit a608c4422665ce1e933483b7c2a25ab2daae5930
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 16:03:36 2005 +0000
Try adding build system for ATI driver again. Who knows, maybe CVS works
diff --git a/driver/xf86-video-mach64/Makefile.in b/driver/xf86-video-mach64/Makefile.in
index 4b169d002..8197c2f2b 100644
--- a/driver/xf86-video-mach64/Makefile.in
+++ b/driver/xf86-video-mach64/Makefile.in
@@ -154,9 +154,9 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -300,6 +300,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -579,6 +580,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@@ -586,7 +588,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
diff --git a/driver/xf86-video-mach64/README b/driver/xf86-video-mach64/README
index 2fc358ae0..f7a503779 100644
--- a/driver/xf86-video-mach64/README
+++ b/driver/xf86-video-mach64/README
@@ -754,7 +754,7 @@
If you are experiencing problems that are not already recorded in this
document, first ensure that you have the latest current release of
this driver and the Xorg X server. Check the server's log (usually
- found in /var/log/Xorg.0.log) and http://www.x.org/releases/individual/
+ found in /var/log/Xorg.0.log) and https://www.x.org/releases/individual/
if you are uncertain.
Secondly, please check Xorg's doc directory for additional
@@ -762,7 +762,7 @@
Thirdly, a scan through the comp.windows.x.i386unix and
comp.os.linux.x newsgroups, the xorg mailing list archives at
- http://lists.freedesktop.org/mailman/listinfo/xorg, and the Xorg bug
+ https://lists.x.org/mailman/listinfo/xorg, and the Xorg bug
database at https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
can also prove useful in resolving problems.
@@ -827,27 +827,20 @@
The introduction of version 6 is a first swipe at porting the driver
to non-Intel architectures.
+ -----------------------------------------------------------------------
+
All questions regarding this software should be directed at the
Xorg mailing list:
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ https://lists.freedesktop.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mach64
+ https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64
- http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64
+Please submit bug reports and requests to merge patches there.
For patch submission instructions, see:
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
diff --git a/driver/xf86-video-mach64/aclocal.m4 b/driver/xf86-video-mach64/aclocal.m4
index 7d21af36b..cb4ccfce8 100644
--- a/driver/xf86-video-mach64/aclocal.m4
+++ b/driver/xf86-video-mach64/aclocal.m4
@@ -8606,32 +8606,63 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -8653,18 +8684,19 @@ if test -n "$PKG_CONFIG"; then
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -8674,8 +8706,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -8687,10 +8721,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8698,26 +8733,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -8727,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -8748,7 +8781,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -8764,16 +8797,40 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -8784,16 +8841,18 @@ AC_ARG_WITH([pkgconfigdir],
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -8804,7 +8863,7 @@ AC_ARG_WITH([noarch-pkgconfigdir],
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
@@ -11797,7 +11856,7 @@ dnl
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1
diff --git a/driver/xf86-video-mach64/compile b/driver/xf86-video-mach64/compile
index de0005d4f..df363c8fb 100644
--- a/driver/xf86-video-mach64/compile
+++ b/driver/xf86-video-mach64/compile
@@ -1,9 +1,9 @@
-#!/bin/sh
+#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -340,7 +340,7 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/driver/xf86-video-mach64/configure b/driver/xf86-video-mach64/configure
index 26fb4ffdb..20bc976dd 100755
--- a/driver/xf86-video-mach64/configure
+++ b/driver/xf86-video-mach64/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-mach64 6.9.6.
+# Generated by GNU Autoconf 2.69 for xf86-video-mach64 6.9.7.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -591,9 +591,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xf86-video-mach64'
PACKAGE_TARNAME='xf86-video-mach64'
-PACKAGE_VERSION='6.9.6'
-PACKAGE_STRING='xf86-video-mach64 6.9.6'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_VERSION='6.9.7'
+PACKAGE_STRING='xf86-video-mach64 6.9.7'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -781,6 +781,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -878,6 +879,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1130,6 +1132,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1267,7 +1278,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1380,7 +1391,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-mach64 6.9.6 to adapt to many kinds of systems.
+\`configure' configures xf86-video-mach64 6.9.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1420,6 +1431,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1451,7 +1463,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-mach64 6.9.6:";;
+ short | recursive ) echo "Configuration of xf86-video-mach64 6.9.7:";;
esac
cat <<\_ACEOF
@@ -1524,7 +1536,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues>.
_ACEOF
ac_status=$?
fi
@@ -1587,7 +1599,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-mach64 configure 6.9.6
+xf86-video-mach64 configure 6.9.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1978,9 +1990,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##"
+( $as_echo "## ---------------------------------------------------------------------------------- ##
+## Report this to https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues ##
+## ---------------------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2002,7 +2014,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-mach64 $as_me 6.9.6, which was
+It was created by xf86-video-mach64 $as_me 6.9.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2831,7 +2843,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-mach64'
- VERSION='6.9.6'
+ VERSION='6.9.7'
cat >>confdefs.h <<_ACEOF
@@ -2878,29 +2890,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
- USE_MAINTAINER_MODE=no
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
-
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -17820,7 +17809,7 @@ fi
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17855,7 +17844,7 @@ $as_echo "$_EXT_CHECK" >&6; }
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17890,7 +17879,7 @@ $as_echo "$_EXT_CHECK" >&6; }
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17925,7 +17914,7 @@ $as_echo "$_EXT_CHECK" >&6; }
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17961,8 +17950,8 @@ $as_echo "$_EXT_CHECK" >&6; }
# Obtain compiler/linker options for the driver dependencies
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
-$as_echo_n "checking for XORG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES" >&5
+$as_echo_n "checking for xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES... " >&6; }
if test -n "$XORG_CFLAGS"; then
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
@@ -18002,7 +17991,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18029,7 +18018,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18052,8 +18041,8 @@ $as_echo "yes" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
-$as_echo_n "checking for XEXT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xextproto >= 7.0.99.1" >&5
+$as_echo_n "checking for xextproto >= 7.0.99.1... " >&6; }
if test -n "$XEXT_CFLAGS"; then
pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
@@ -18093,7 +18082,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18111,7 +18100,7 @@ fi
HAVE_XEXTPROTO_71="no"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
HAVE_XEXTPROTO_71="no"
else
@@ -18255,8 +18244,8 @@ fi
if test "$DRI" = yes; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5
-$as_echo_n "checking for DRI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdrm >= 2.2 xf86driproto" >&5
+$as_echo_n "checking for libdrm >= 2.2 xf86driproto... " >&6; }
if test -n "$DRI_CFLAGS"; then
pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
@@ -18296,7 +18285,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18323,7 +18312,7 @@ Alternatively, you may set the environment variables DRI_CFLAGS
and DRI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18444,29 +18433,19 @@ $as_echo_n "checking whether to enable EXA support... " >&6; }
if test "x$EXA" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/exa.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sdkdir}/exa.h" >&5
-$as_echo_n "checking for ${sdkdir}/exa.h... " >&6; }
-if eval \${$as_ac_File+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- test "$cross_compiling" = yes &&
- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${sdkdir}/exa.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+ ac_fn_c_check_header_compile "$LINENO" "exa.h" "ac_cv_header_exa_h" "#include <xorg-server.h>
+"
+if test "x$ac_cv_header_exa_h" = xyes; then :
have_exa_h="yes"
else
have_exa_h="no"
fi
+
+ CPPFLAGS="$SAVE_CPPFLAGS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -18480,8 +18459,8 @@ $as_echo_n "checking whether EXA version is at least 2.0.0... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include "xorg-server.h"
-#include "exa.h"
+#include <xorg-server.h>
+#include <exa.h>
#if EXA_VERSION_MAJOR < 2
#error OLD EXA!
#endif
@@ -18580,8 +18559,8 @@ fi
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5
-$as_echo_n "checking for PCIACCESS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pciaccess >= 0.12.901" >&5
+$as_echo_n "checking for pciaccess >= 0.12.901... " >&6; }
if test -n "$PCIACCESS_CFLAGS"; then
pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
@@ -18621,7 +18600,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18648,7 +18627,7 @@ Alternatively, you may set the environment variables PCIACCESS_CFLAGS
and PCIACCESS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18825,10 +18804,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19266,7 +19241,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-mach64 $as_me 6.9.6, which was
+This file was extended by xf86-video-mach64 $as_me 6.9.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19326,13 +19301,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-video-mach64 config.status 6.9.6
+xf86-video-mach64 config.status 6.9.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/driver/xf86-video-mach64/configure.ac b/driver/xf86-video-mach64/configure.ac
index ab2f6c01b..4a9a33ffe 100644
--- a/driver/xf86-video-mach64/configure.ac
+++ b/driver/xf86-video-mach64/configure.ac
@@ -23,16 +23,15 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.6],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [6.9.7],
+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@@ -166,7 +165,13 @@ fi
AC_MSG_CHECKING([whether to enable EXA support])
if test "x$EXA" = xyes; then
AC_MSG_RESULT(yes)
- AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"])
+
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+ AC_CHECK_HEADER(exa.h,
+ [have_exa_h="yes"], [have_exa_h="no"],
+ [#include <xorg-server.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"
else
AC_MSG_RESULT(no)
fi
@@ -176,8 +181,8 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
if test "x$have_exa_h" = xyes; then
AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#include "exa.h"
+#include <xorg-server.h>
+#include <exa.h>
#if EXA_VERSION_MAJOR < 2
#error OLD EXA!
#endif
diff --git a/driver/xf86-video-mach64/man/Makefile.in b/driver/xf86-video-mach64/man/Makefile.in
index cca8b2d1e..b3939ffb8 100644
--- a/driver/xf86-video-mach64/man/Makefile.in
+++ b/driver/xf86-video-mach64/man/Makefile.in
@@ -271,6 +271,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/driver/xf86-video-mach64/src/Makefile.in b/driver/xf86-video-mach64/src/Makefile.in
index 4940e7d3a..12cc246f4 100644
--- a/driver/xf86-video-mach64/src/Makefile.in
+++ b/driver/xf86-video-mach64/src/Makefile.in
@@ -332,6 +332,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/driver/xf86-video-mach64/src/aticonfig.c b/driver/xf86-video-mach64/src/aticonfig.c
index c2c6404fd..30298ba73 100644
--- a/driver/xf86-video-mach64/src/aticonfig.c
+++ b/driver/xf86-video-mach64/src/aticonfig.c
@@ -311,6 +311,10 @@ ATIProcessOptions
(void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 25
+# define boolean bool
+#endif
+
# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean
# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean
# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean
@@ -360,7 +364,7 @@ ATIProcessOptions
ReferenceClock = ((double)157500000.0) / ((double)11.0);
#ifdef __sparc__
if (pATI->Chip == ATI_CHIP_264XL || pATI->Chip == ATI_CHIP_MOBILITY)
- ReferenceClock = 29500000.0;
+ ReferenceClock = 29500000.0;
#endif
ShadowFB = TRUE;
@@ -446,7 +450,7 @@ ATIProcessOptions
pATI->OptionDMAMode = MACH64_MODE_MMIO;
else {
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unkown dma_mode: '%s'\n", DMAMode);
+ "Unknown dma_mode: '%s'\n", DMAMode);
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
"Valid dma_mode options are: 'async','sync','mmio'\n");
xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
diff --git a/driver/xf86-video-mach64/src/atidri.c b/driver/xf86-video-mach64/src/atidri.c
index 8c8d81c60..a172bfa69 100644
--- a/driver/xf86-video-mach64/src/atidri.c
+++ b/driver/xf86-video-mach64/src/atidri.c
@@ -1321,7 +1321,7 @@ Bool ATIDRIFinishScreenInit( ScreenPtr pScreen )
* an extraction of the hardware-affecting bits from mach64_do_init_drm()
* (see atidrm.c)
* I am assuming here that pATI->pDRIServerInfo doesn't change
- * elsewhere in incomaptible ways.
+ * elsewhere in incompatible ways.
* How will this code react to resuming after a failed resumeor pci based dri ?
*/
void ATIDRIResume( ScreenPtr pScreen )
diff --git a/driver/xf86-video-mach64/src/atidri.h b/driver/xf86-video-mach64/src/atidri.h
index 52d4b44ad..bfc4b0f0d 100644
--- a/driver/xf86-video-mach64/src/atidri.h
+++ b/driver/xf86-video-mach64/src/atidri.h
@@ -38,7 +38,7 @@
#define ATI_AGP_MAX_MODE 2
-/* Imported from the radeon suspend code writen by cpbotha@ieee.org
+/* Imported from the radeon suspend code written by cpbotha@ieee.org
* to enable suspend/resume support for the mach64 card.
*/
extern void ATIDRIResume(ScreenPtr pScreen);
diff --git a/driver/xf86-video-mach64/src/atimach64io.h b/driver/xf86-video-mach64/src/atimach64io.h
index d1b14d248..80553f8cf 100644
--- a/driver/xf86-video-mach64/src/atimach64io.h
+++ b/driver/xf86-video-mach64/src/atimach64io.h
@@ -76,9 +76,9 @@
* any ordering constraints the engine might impose. Groups larger than 16
* outf()'s should be split up into two or more groups as needed (but not
* necessarily wanted). The outf() groups that result should be immediately
- * preceeded by an ATIMach64WaitForFIFO(n) call, where "n" is the number of
+ * preceded by an ATIMach64WaitForFIFO(n) call, where "n" is the number of
* outf()'s in the group with the exception that groups containing a single
- * outf() should not be thus preceeded. This means "n" should not be less than
+ * outf() should not be thus preceded. This means "n" should not be less than
* 2, nor larger than 16.
*/
diff --git a/driver/xf86-video-mach64/src/atimach64render.c b/driver/xf86-video-mach64/src/atimach64render.c
index 8d259fa2d..dae939e75 100644
--- a/driver/xf86-video-mach64/src/atimach64render.c
+++ b/driver/xf86-video-mach64/src/atimach64render.c
@@ -77,8 +77,8 @@
*
* A texture unit combines the fragment color (VERTEX_?_ARGB) coming in from
* triangle rasterization with the texel from the texture according to the
- * texture environment (TEX_LIGHT_FCN_). "1x1 R" textures may come in as frag-
- * ment colors, eliminating the need for multitexturing in all interesting
+ * texture environment (TEX_LIGHT_FCN_). "1x1 R" textures may come in as
+ * fragment colors, eliminating the need for multitexturing in all interesting
* cases (via also uses this optimization).
*
* Texture registers are saved/restored and cached (see atimach64.c). TEX_CNTL
@@ -88,7 +88,7 @@
*
* Vertex registers are not saved/restored. This shouldn't be a problem though
* either for DRI or VT switch because vertex registers are set and used within
- * a signle acceleration hook. Synchronization between the DDX and DRI is based
+ * a single acceleration hook. Synchronization between the DDX and DRI is based
* on calling ATIDRISync() at the beginning of each DDX acceleration hook,
* which suggests the assumption that individual acceleration hooks are not
* interrupted.
@@ -701,8 +701,8 @@ Mach64PrepareComposite
break;
}
if (i == MACH64_NR_TEX_FORMATS)
- MACH64_FALLBACK(("Unsupported picture format 0x%x\n",
- (int)pPict->format));
+ MACH64_FALLBACK(("Unsupported dst format 0x%x\n",
+ (int)pDstPicture->format));
dstFormat = Mach64TexFormats[i].dstFormat;
m3d->dp_pix_width = SetBits(dstFormat, DP_DST_PIX_WIDTH) |
@@ -814,8 +814,12 @@ Mach64Composite
float ooa;
CARD32 col;
PictVector v;
- int srcXend, srcYend;
+ struct vertcoords {
+ int x;
+ int y;
+ } srcvert[4];
float dxy = 0.0, dwh = 0.0;
+ int i;
ATIDRISync(pScreenInfo);
@@ -830,22 +834,23 @@ Mach64Composite
}
/* Handle transform */
- srcXend = srcX + w;
- srcYend = srcY + h;
+ srcvert[0].x = srcX;
+ srcvert[0].y = srcY;
+ srcvert[1].x = srcX + w;
+ srcvert[1].y = srcY;
+ srcvert[2].x = srcX + w;
+ srcvert[2].y = srcY + h;
+ srcvert[3].x = srcX;
+ srcvert[3].y = srcY + h;
if (m3d->transform) {
- v.vector[0] = IntToxFixed(srcX);
- v.vector[1] = IntToxFixed(srcY);
- v.vector[2] = xFixed1;
- PictureTransformPoint(m3d->transform, &v);
- srcX = xFixedToInt(v.vector[0]);
- srcY = xFixedToInt(v.vector[1]);
-
- v.vector[0] = IntToxFixed(srcXend);
- v.vector[1] = IntToxFixed(srcYend);
- v.vector[2] = xFixed1;
- PictureTransformPoint(m3d->transform, &v);
- srcXend = xFixedToInt(v.vector[0]);
- srcYend = xFixedToInt(v.vector[1]);
+ for (i = 0; i < 4; i++) {
+ v.vector[0] = IntToxFixed(srcvert[i].x);
+ v.vector[1] = IntToxFixed(srcvert[i].y);
+ v.vector[2] = xFixed1;
+ PictureTransformPoint(m3d->transform, &v);
+ srcvert[i].x = xFixedToInt(v.vector[0]);
+ srcvert[i].y = xFixedToInt(v.vector[1]);
+ }
#if 0
/* Bilinear needs manipulation of texture coordinates */
@@ -857,10 +862,10 @@ Mach64Composite
}
/* Create vertices in clock-wise order */
- VTX_SET(v0, col, dstX, dstY, srcX, dxy, srcY, dxy);
- VTX_SET(v1, col, dstX + w, dstY, srcXend, dwh, srcY, dxy);
- VTX_SET(v2, col, dstX + w, dstY + h, srcXend, dwh, srcYend, dwh);
- VTX_SET(v3, col, dstX, dstY + h, srcX, dxy, srcYend, dwh);
+ VTX_SET(v0, col, dstX, dstY, srcvert[0].x, dxy, srcvert[0].y, dxy);
+ VTX_SET(v1, col, dstX + w, dstY, srcvert[1].x, dwh, srcvert[1].y, dxy);
+ VTX_SET(v2, col, dstX + w, dstY + h, srcvert[2].x, dwh, srcvert[2].y, dwh);
+ VTX_SET(v3, col, dstX, dstY + h, srcvert[3].x, dxy, srcvert[3].y, dwh);
/* Setup upper triangle (v0, v1, v3) */
VTX_OUT(v0, 1);
diff --git a/driver/xf86-video-mach64/src/atimach64xv.c b/driver/xf86-video-mach64/src/atimach64xv.c
index 5e43ab8c5..6e3459407 100644
--- a/driver/xf86-video-mach64/src/atimach64xv.c
+++ b/driver/xf86-video-mach64/src/atimach64xv.c
@@ -307,7 +307,7 @@ ATIMach64SetDefaultAttributes
}
/*
- * There is a one-to-one correspondance between elements of the following array
+ * There is a one-to-one correspondence between elements of the following array
* and those of ATIMach64Attribute.
*/
static ATIMach64AttributeRec ATIMach64AttributeInfo[nATIMach64Attribute] =
diff --git a/driver/xf86-video-mach64/src/atiscreen.c b/driver/xf86-video-mach64/src/atiscreen.c
index aa1d1cbd7..bb7fd4bae 100644
--- a/driver/xf86-video-mach64/src/atiscreen.c
+++ b/driver/xf86-video-mach64/src/atiscreen.c
@@ -240,7 +240,7 @@ ATIMach64SetupMemXAA
scanlines = total / widthBytes;
if (scanlines > ATIMach64MaxY) scanlines = ATIMach64MaxY;
- /* Recalculate the texture offset and size to accomodate any
+ /* Recalculate the texture offset and size to accommodate any
* rounding to a whole number of scanlines.
* FIXME: Is this actually needed?
*/
diff --git a/driver/xf86-video-mach64/src/ativgaio.h b/driver/xf86-video-mach64/src/ativgaio.h
index c73e8ae1b..14e34675a 100644
--- a/driver/xf86-video-mach64/src/ativgaio.h
+++ b/driver/xf86-video-mach64/src/ativgaio.h
@@ -38,7 +38,7 @@
extern void ATISetVGAIOBase(ATIPtr, const CARD8);
-/* Odds and ends to ease reading and writting of indexed registers */
+/* Odds and ends to ease reading and writing of indexed registers */
#define GetReg(_Register, _Index) \
( \
outb(_Register, _Index), \
diff --git a/driver/xf86-video-mach64/src/atividmem.c b/driver/xf86-video-mach64/src/atividmem.c
index 0104a0aef..b9df6d73b 100644
--- a/driver/xf86-video-mach64/src/atividmem.c
+++ b/driver/xf86-video-mach64/src/atividmem.c
@@ -47,7 +47,7 @@ const char *ATIMemoryTypeNames_88800CX[] =
"DRAM (256Kx4, x8, x16)",
"EDO DRAM (256Kx4, x8, x16)",
"Unknown video memory type",
- "DRAM (256Kx16 with assymetric RAS/CAS)",
+ "DRAM (256Kx16 with asymmetric RAS/CAS)",
"Unknown video memory type",
"Unknown video memory type",
"Unknown video memory type",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:02:30 +0000