Update to xf86-video-r128 6.8.2

This commit is contained in:
matthieu 2012-04-08 17:49:07 +00:00
parent 0d672369ec
commit 0bc99fee60
25 changed files with 31029 additions and 22904 deletions

View File

@ -1,12 +1,91 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Copyright 2007 George Sapountzis
Please submit updated COPYING files to the Xorg bugzilla:
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
Precision Insight, Inc., Cedar Park, Texas, and
VA Linux Systems Inc., Fremont, California.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation on the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice (including the
next paragraph) shall be included in all copies or substantial
portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting documentation, and
that the name of Marc Aurele La France not be used in advertising or
publicity pertaining to distribution of the software without specific,
written prior permission. Marc Aurele La France makes no representations
about the suitability of this software for any purpose. It is provided
"as-is" without express or implied warranty.
MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
http://lists.freedesktop.org/mailman/listinfo/xorg

View File

@ -1,3 +1,329 @@
commit 1ac4cd4b41d0e8232660df78ff136df1214f3907
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 19:23:54 2012 -0700
xf86-video-r128 6.8.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2cab077d6a0380fa22fa3dda8669cf0613aee17b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 19:23:17 2012 -0700
Sun's copyrights are owned by Oracle now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 22057e94b9f7cc8f707893400628c2d9875b2955
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 4 14:24:36 2012 +1000
Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b4892e34011d6da577002a29913a803d5dbe1c06
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:07:11 2011 -0500
Fix for new vgahw ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4ad32624b2f1344168e0083d33227021c87fee60
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:06:11 2011 -0500
Make failure to XAA non-fatal
No shadowfb support in this driver yet
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 67aaa4698586d75242627b7ce8f4815eeb08f853
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 31 11:56:33 2011 -0700
Build fix for older servers (error: conflicting types for 'pciTag')
/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ea9e6b548633df5b6ffeac8071f27a5c04ac817e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 29 19:31:19 2011 -0700
pciTag was removed from xorg-server, so provide it in-driver until this is updated to use libpciaccess
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cfcaac0d7861c00af23c683487dcad2fcb51a908
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 29 19:29:35 2011 -0700
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3de85360ca4bfdece74f8b161305b2d4276b705e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 14 14:38:52 2010 -0400
Don't allow the config file to override BIOS location
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 65c50344d147fddc36212c01d307c6e002b6a84e
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:51 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b56e5c7d651515d16605107145c8b39b76dd69e3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
commit 41a59f565b92f2175c96595428c03293cb7e8d34
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit aaef5ae3fb37797ef2c521a33c0f5b6e7462cecd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit f057cc8a58538336862b1e2938a46b7d1e2c2288
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit e260e999e6182e9a976d576a4d36a25b6939f508
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit ecff91a9c660c2fe22ecee7740819dd0ebea97af
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:54:12 2010 -0400
config: remove unrequired AC_SUBST([DRI_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 6a21d8268b7005b5789afdd638529a342037f755
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b6cfee442b87418ded95dc9d9e5c43bbf57149c9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 0a912e700d92b04bbe644904e76edf2483b4f0df
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 56448e3a41dad4ba912c92e4c23565b8a2312d91
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b6f59edaef05a42e25cb7797ac5c78ad81b1be00
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
commit 1936b9bb4746e86a10add4752b4394aad4bb5a19
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 09:07:23 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 56bea2e89ceb84377976ab60bc9bf1707f3bec39
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 09:05:11 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b0be6cec03728dae8826c9d256790badfece6090
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 10:00:41 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b5ba30924e001d0510313cedc96200860faa01c0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 10:00:41 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit c8657cd4bf014d56708512916a780fccb4c10b05
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Mar 8 10:46:45 2010 -0500
Don't check for Xinerama.
It doesn't seem to be used anywhere, so don't require it.
CC: Jerome Glisse <jglisse@redhat.com>
CC: Alex Deucher <alexdeucher@gmail.com>
CC: Dave Airlie <airlied@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit fa91ba1a82c44aacdb469bc2da57f5d1f924f8ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:45:24 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 7bc68200e08a7ab228d6be9da0943ac119a9f13e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 21:47:20 2009 -0500
configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit a502b2339bfe4cecfb7a1f4f3ce217687c1b50e6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
commit ac6c537bfc139cb7c5d76650c4146c86b9889902
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
commit e05f059ecd970f3d9f5454f1689ce45cbc660a55
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
commit 34b22945240af367dc1f874733a49cdeb7526bb0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:21 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
commit 8aa9c81ec3fee4b1b943949d62ee90be1c2e320c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:17 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
r128: bump for release 6.8.1
commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
@ -219,7 +545,7 @@ Date: Mon Feb 25 07:10:48 2008 +1000
fixup check for EXA composite pointed out by Alan Swanson
commit 85e470e64f629de72e361c77770e2e29998d1bf4
Merge: 27ddb39... 1b84c76...
Merge: 27ddb39 1b84c76
Author: Alex Deucher <alex@samba.(none)>
Date: Sun Feb 24 05:37:22 2008 -0500
@ -907,7 +1233,7 @@ Date: Mon Jan 14 16:11:09 2008 -0500
Fixes bug 14001
commit 729da30c80d6545b75c8faea44754634f477cc09
Merge: 000741e... 625a885...
Merge: 000741e 625a885
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Jan 14 10:05:01 2008 -0500
@ -1100,7 +1426,7 @@ Date: Wed Jan 2 19:48:28 2008 -0500
RADEON: various avivo tv-out related clean-ups
commit ce34090c758ac91171cb6adb9b8a36e4adbf99cf
Merge: 2180f04... 30cab1d...
Merge: 2180f04 30cab1d
Author: Alex Deucher <alex@samba.(none)>
Date: Wed Jan 2 16:41:36 2008 -0500
@ -1307,7 +1633,7 @@ Date: Fri Dec 21 09:45:55 2007 +1000
set ddc line correctly post-merge
commit 3c31b96afa20913ad947e68fe0c3a662e5eafbdd
Merge: eb99c3c... f5e8c18...
Merge: eb99c3c f5e8c18
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 21 09:36:22 2007 +1000
@ -1348,7 +1674,7 @@ Date: Wed Dec 19 19:15:19 2007 -0500
The correct thing to do is filter by the mode's effective memory bandwidth.
commit c1b0b69cc50516c3b7e881b0eb46cb3cd2e9dce6
Merge: 0e66348... ce4fa1c...
Merge: 0e66348 ce4fa1c
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Dec 19 11:54:50 2007 -0500
@ -1423,14 +1749,14 @@ Date: Mon Dec 17 20:20:04 2007 -0500
RADEON: fix typo from merge
commit 19b9d3708852b7efe2b05249c8359dadb924dd94
Merge: cf685f3... 29706ca...
Merge: cf685f3 29706ca
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Dec 17 20:07:32 2007 -0500
Merge branch 'atombios-support' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
commit cf685f37ec874f0aacd09e7c4eb0402c6daec1b0
Merge: 2a134af... 44d07c4...
Merge: 2a134af 44d07c4
Author: Alex Deucher <alex@samba.(none)>
Date: Mon Dec 17 20:07:07 2007 -0500
@ -1579,7 +1905,7 @@ Date: Thu Dec 13 18:45:09 2007 -0500
- Unify the PLL calculation between legacy and avivo chips
commit f5ac34983411e4c4f41ab1817dce582830f398fd
Merge: f2b2e08... 6ccf5b3...
Merge: f2b2e08 6ccf5b3
Author: Alex Deucher <alex@samba.(none)>
Date: Wed Dec 12 22:37:44 2007 -0500
@ -1632,7 +1958,7 @@ Date: Tue Dec 11 14:04:58 2007 -0500
RADEON: handle HMDI properly (untested) and fix some merge leftovers
commit 3c22ad977c25d5ca2811821fcac6bb8ecd79994a
Merge: c9a0cee... f3d2ec3...
Merge: c9a0cee f3d2ec3
Author: Alex Deucher <alex@botch2.(none)>
Date: Tue Dec 11 13:11:15 2007 -0500
@ -1688,7 +2014,7 @@ Date: Mon Dec 10 15:25:56 2007 +1000
add support for building against legacy servers similiar to Intel codepaths
commit 9c278cb7fa7f18d13bde053fd75221cfba9da377
Merge: 6451ea2... cc167b9...
Merge: 6451ea2 cc167b9
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Dec 10 15:18:03 2007 +1000
@ -1702,7 +2028,7 @@ Date: Mon Dec 10 15:18:03 2007 +1000
src/radeon_output.c
commit 6451ea2dcc4fac762442f699935864f4a8d445f7
Merge: 0d89556... 5896ca4...
Merge: 0d89556 5896ca4
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Dec 10 15:08:42 2007 +1000
@ -1762,7 +2088,7 @@ Date: Thu Dec 6 19:23:06 2007 +1100
powerpc: build fixes from last merge
commit dbe3d2608ecc9896db9c23b3a347b50748c51e13
Merge: 48e31cd... 21ed435...
Merge: 48e31cd 21ed435
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Dec 6 14:22:03 2007 +1000
@ -1863,7 +2189,7 @@ Date: Fri Nov 30 20:11:42 2007 -0500
mode or vesafb etc. after running the driver.
commit af0196f7bf0d1d5d211391149c18935d64ed2b06
Merge: d9858a2... 0175b79...
Merge: d9858a2 0175b79
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 30 16:40:28 2007 -0500
@ -1895,7 +2221,7 @@ Date: Fri Nov 30 15:37:42 2007 -0500
for now.
commit e1945f1f25a34310bd58ce128c8ff27ecc985618
Merge: b368b0f... df7777b...
Merge: b368b0f df7777b
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 30 14:30:55 2007 -0500
@ -2116,7 +2442,7 @@ Date: Wed Nov 21 17:03:39 2007 -0500
Thanks to AMD for the information
commit a12390c832abe423def60e39cd5a9118e5910339
Merge: d531792... e74dca1...
Merge: d531792 e74dca1
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Nov 21 02:24:48 2007 -0500
@ -2169,7 +2495,7 @@ Date: Wed Nov 21 00:05:42 2007 -0500
RADEON: store devices ids from bios for each driver output
commit 3975da2ea8cb628f7f66c3f26c5dfa181cd1c532
Merge: e283aa3... 295ce27...
Merge: e283aa3 295ce27
Author: Alex Deucher <alex@botch2.(none)>
Date: Tue Nov 20 23:52:29 2007 -0500
@ -2269,7 +2595,7 @@ Date: Tue Nov 20 13:37:00 2007 +1000
atombios: add all r5xx and r6xx pci ids
commit 5d023e2c3c2ab44ea57ffadc9607025d602c376c
Merge: 0d1e0c7... c887260...
Merge: 0d1e0c7 c887260
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 13:02:43 2007 +1000
@ -2294,7 +2620,7 @@ Date: Tue Nov 20 08:15:58 2007 +1000
r5xx: cleanups after last merge
commit fe2f7a09050fb7a345a1f52239f8f3c4f1053891
Merge: 744c8cb... 49055d8...
Merge: 744c8cb 49055d8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 08:04:32 2007 +1000
@ -2306,7 +2632,7 @@ Date: Tue Nov 20 08:04:32 2007 +1000
src/radeon_output.c
commit 744c8cb6c293fcaa687566f52901644e699baace
Merge: e258fbe... e530af7...
Merge: e258fbe e530af7
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Nov 20 07:56:33 2007 +1000
@ -2319,14 +2645,14 @@ Date: Mon Nov 19 16:35:05 2007 +1000
makes 2-headed cursor work
commit e530af79adf51b3e95a0eca676c915a34dcbf4a7
Merge: 69e197f... 52aba8d...
Merge: 69e197f 52aba8d
Author: Alex Deucher <alex@botch2.(none)>
Date: Mon Nov 19 00:59:30 2007 -0500
Merge branch 'agd-atom' of /home/alex/git/airlied/xf86-video-ati2 into agd-atom
commit 69e197f2c8002aacf2587754c8d3bd63c88f85b1
Merge: 5e8940f... 862dcab...
Merge: 5e8940f 862dcab
Author: Alex Deucher <alex@botch2.(none)>
Date: Mon Nov 19 00:57:34 2007 -0500
@ -2357,7 +2683,7 @@ Date: Mon Nov 19 00:39:19 2007 -0500
Don't assign a gpio for TV
commit 52aba8d73189ba959f19c0437499d5e7a8829827
Merge: 862dcab... 5e8940f...
Merge: 862dcab 5e8940f
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 19 15:30:46 2007 +1000
@ -2394,7 +2720,7 @@ Date: Sun Nov 18 23:43:06 2007 -0500
fix typo in loop
commit 384cd8f52c89d089c6559e2eedbae45641fcd14e
Merge: f3f0e4e... 234b607...
Merge: f3f0e4e 234b607
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 19 14:02:55 2007 +1000
@ -2463,7 +2789,7 @@ Date: Sat Nov 17 00:34:56 2007 -0500
WIP: more new ATOM integration work
commit 67db114d97abed7a607467e5d67c7b4ffa2c347e
Merge: 7d06a87... ea15346...
Merge: 7d06a87 ea15346
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Nov 16 14:29:53 2007 -0500
@ -2526,7 +2852,7 @@ Date: Fri Nov 16 14:48:36 2007 +1000
Add copyright headers
commit 3cfcd2164b400bd0d1cb4ede8eeb01abba9d75c8
Merge: efac14e... 718bfd3...
Merge: efac14e 718bfd3
Author: Alex Deucher <alex@botch2.(none)>
Date: Thu Nov 15 23:25:39 2007 -0500
@ -3047,7 +3373,7 @@ Date: Thu Oct 4 11:32:48 2007 +0200
Surprisingly easy, thanks to George's pci-rework changes.
commit 7addf41885ec5658f531624a9c24ea5bd7d22d19
Merge: 3a958ba... 78c6bd3...
Merge: 3a958ba 78c6bd3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:06:08 2007 +0200
@ -3506,7 +3832,7 @@ Date: Tue Aug 28 15:37:11 2007 +0300
It still uses the old probe method though, this is due to the ati wrapper.
commit 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef
Merge: 2e3d43a... 673f799...
Merge: 2e3d43a 673f799
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue Aug 28 16:01:12 2007 +0300
@ -3770,14 +4096,14 @@ Date: Thu Aug 23 19:56:21 2007 +1000
updated release numbering for randr 1.2
commit 81a8093f2ffdce59d4e8a44f65f3d5c771fd6425
Merge: c08e6ec... 53a67e3...
Merge: c08e6ec 53a67e3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 23 19:51:47 2007 +1000
Merge remote branch 'origin/randr-1.2'
commit c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37
Merge: 5793e87... a0d0fcd...
Merge: 5793e87 a0d0fcd
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date: Thu Aug 23 19:42:19 2007 +1000
@ -4650,7 +4976,7 @@ Date: Wed May 30 17:49:01 2007 +1000
we hang when moving the cursor into the second CRTC.
commit 7fc02657c4d740941fbda5a8823cf45de3eca3f8
Merge: 800bf53... 4c61c0e...
Merge: 800bf53 4c61c0e
Author: Dave Airlie <airlied@nx6125b.(none)>
Date: Wed May 30 17:27:22 2007 +1000
@ -4705,7 +5031,7 @@ Date: Tue May 29 07:23:24 2007 +1000
rs480: only has single dac
commit c52322354fe64725733842b3356798c50e7735d5
Merge: dd6a966... 975da59...
Merge: dd6a966 975da59
Author: Dave Airlie <airlied@nx6125b.(none)>
Date: Tue May 29 07:21:48 2007 +1000
@ -5187,7 +5513,7 @@ Date: Tue May 8 19:27:48 2007 +0200
remove some old mergedfb cruft
commit 76670f665ebec7cdf40a04bf9379cb3ad4417507
Merge: 83f81ed... a3ee422...
Merge: 83f81ed a3ee422
Author: Alex Deucher <alex@t41p.hsd1.va.comcast.net>
Date: Tue May 8 18:41:25 2007 +0200
@ -5638,7 +5964,7 @@ Date: Sun Feb 25 23:29:09 2007 +1100
fix typo
commit 3cfe94d5438961b869766dacbcd13fde8b770ca2
Merge: 31c018c... 3b43788...
Merge: 31c018c 3b43788
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 25 23:27:19 2007 +1100
@ -5831,7 +6157,7 @@ Date: Sun Feb 4 11:28:54 2007 +0200
case because pATI->PCIInfo is now set after ATIProcessOptions() is called.
commit 9d77aabdff919360f0c9333105436c31f1f5749a
Merge: ff8ea19... 57822be...
Merge: ff8ea19 57822be
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Mon Feb 5 19:16:51 2007 +0200
@ -7004,7 +7330,7 @@ Date: Mon Sep 25 11:35:32 2006 +1000
radeon: cleanup some bits from superpatch
commit 9827afaa40720a58e2fc029c0bf92ad2fe223d11
Merge: 10b4b46... ad8259c...
Merge: 10b4b46 ad8259c
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Sep 25 11:25:17 2006 +1000
@ -7149,7 +7475,7 @@ Date: Fri Sep 22 06:35:34 2006 +1000
radeon: add enable display function
commit 4a54886d510f26b29d27e5c9a73647554291b1a6
Merge: 70264d6... 9fa176c...
Merge: 70264d6 9fa176c
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Sep 22 06:00:04 2006 +1000
@ -7765,7 +8091,7 @@ Date: Thu Jun 15 15:35:05 2006 +0200
Fix some more cosmetic warnings.
commit ec93e08b24f7c0e583970d08bfe18ad142e6b047
Merge: 051c49d... 6ca9862...
Merge: 051c49d 6ca9862
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 15:03:27 2006 +0200
@ -7784,7 +8110,7 @@ Date: Thu Jun 15 21:24:16 2006 +1000
remove all printf specifier warnings on Linux
commit 051c49d0f002c72d1d8f15f6df264d8b093d4e95
Merge: a840afc... dfac819...
Merge: a840afc dfac819
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 13:10:44 2006 +0200
@ -7809,7 +8135,7 @@ Date: Thu Jun 15 20:59:33 2006 +1000
some more unused variable cleanups
commit a840afc75a0453b4694e3f987ebdbddc6844a169
Merge: c90c49d... d511ef4...
Merge: c90c49d d511ef4
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jun 15 12:46:58 2006 +0200

View File

@ -0,0 +1,291 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

View File

@ -18,21 +18,15 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
if BUILD_LINUXDOC
README.r128: README.r128.sgml
$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
.PHONY: ChangeLog INSTALL
endif
EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
CLEANFILES = ChangeLog
.PHONY: ChangeLog
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL

View File

@ -42,9 +42,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -57,7 +57,7 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -90,12 +90,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -103,23 +105,18 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
@ -128,44 +125,47 @@ DRI_FALSE = @DRI_FALSE@
DRI_LIBS = @DRI_LIBS@
DRI_TRUE = @DRI_TRUE@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINUXDOC = @LINUXDOC@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_HTML = @MAKE_HTML@
MAKE_PDF = @MAKE_PDF@
MAKE_PS = @MAKE_PS@
MAKE_TEXT = @MAKE_TEXT@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -176,11 +176,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
USE_EXA_FALSE = @USE_EXA_FALSE@
USE_EXA_TRUE = @USE_EXA_TRUE@
@ -189,15 +189,14 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -211,7 +210,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -240,10 +238,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
CLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -607,7 +603,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -615,6 +610,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -683,15 +679,15 @@ uninstall-info: uninstall-info-recursive
tags tags-recursive uninstall uninstall-am uninstall-info-am
@BUILD_LINUXDOC_TRUE@README.r128: README.r128.sgml
@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
.PHONY: ChangeLog INSTALL
.PHONY: ChangeLog
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,4 +1,161 @@
xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
Information for ATI Rage 128 Users
Precision Insight, Inc., SuSE GmbH
13 June 2000
____________________________________________________________
Table of Contents
1. Supported Hardware
2. Features
3. Technical Notes
4. Reported Working Video Cards
5. Configuration
6. Driver Options
7. Known Limitations
8. Authors
______________________________________________________________________
1. Supported Hardware
o ATI Rage 128 based cards
2. Features
o Full support (including hardware accelerated 2D drawing) for 8, 15,
16, 24 bit pixel depths.
o Hardware cursor support to reduce sprite flicker.
o Support for high resolution video modes up to 1800x1440 @ 70Hz.
o Support for doublescan video modes (e.g., 320x200 and 320x240).
o Support for gamma correction at all pixel depths.
o Fully programmable clock supported.
o Robust text mode restore for VT switching.
3. Technical Notes
o None
4. Reported Working Video Cards
o Rage Fury AGP 32MB
o XPERT 128 AGP 16MB
o XPERT 99 AGP 8MB
5. Configuration
The driver auto-detects all device information necessary to initialize
the card. The only lines you need in the "Device" section of your
xorg.conf file are:
Section "Device"
Identifier "Rage 128"
Driver "r128"
EndSection
or let xorgconfig do this for you.
However, if you have problems with auto-detection, you can specify:
o VideoRam - in kilobytes
o MemBase - physical address of the linear framebuffer
o IOBase - physical address of the memory mapped IO registers
o ChipID - PCI DEVICE ID
6. Driver Options
o "hw_cursor" - request hardware cursor (default)
o "sw_cursor" - software cursor only
o "no_accel" - software rendering only
o "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
7. Known Limitations
o None
8. Authors
The X11R7.5 driver was originally part of XFree86 4.4 rc2.
The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com>
o Kevin E. Martin <mailto:kevin@precisioninsight.com>
The XFree86 4 driver was funded by ATI and was donated to The XFree86
Project by:
Precision Insight, Inc.
Cedar Park, TX
USA
The XFree86 3.3.x driver used for the port was written by:
o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com>
o Kevin E. Martin <mailto:kevin@precisioninsight.com>
The XFree86 3.3.x driver was funded by ATI and was donated to The
XFree86 Project by Precision Insight, Inc. It was based in part on
an earlier driver that was written by:
o Alan Hourihane <mailto:alanh@fairlite.demon.co.uk>
o Dirk Hohndel <mailto:hohndel@suse.de>
This early driver was funded and donated to The XFree86 Project by:
SuSE GmbH
Schanzaekerstr. 10
90443 Nuernberg
Germany
http://www.precisioninsight.com
http://www.suse.com
Please submit bugs & patches to the Xorg bugzilla:

View File

@ -1,160 +0,0 @@
Information for ATI Rage 128 Users
Precision Insight, Inc., SuSE GmbH
13 June 2000
____________________________________________________________
Table of Contents
1. Supported Hardware
2. Features
3. Technical Notes
4. Reported Working Video Cards
5. Configuration
6. Driver Options
7. Known Limitations
8. Authors
______________________________________________________________________
1. Supported Hardware
+o ATI Rage 128 based cards
2. Features
+o Full support (including hardware accelerated 2D drawing) for 8, 15,
16, 24 bit pixel depths.
+o Hardware cursor support to reduce sprite flicker.
+o Support for high resolution video modes up to 1800x1440 @ 70Hz.
+o Support for doublescan video modes (e.g., 320x200 and 320x240).
+o Support for gamma correction at all pixel depths.
+o Fully programmable clock supported.
+o Robust text mode restore for VT switching.
3. Technical Notes
+o None
4. Reported Working Video Cards
+o Rage Fury AGP 32MB
+o XPERT 128 AGP 16MB
+o XPERT 99 AGP 8MB
5. Configuration
The driver auto-detects all device information necessary to initialize
the card. The only lines you need in the "Device" section of your
xorg.conf file are:
Section "Device"
Identifier "Rage 128"
Driver "r128"
EndSection
or let xorgconfig do this for you.
However, if you have problems with auto-detection, you can specify:
+o VideoRam - in kilobytes
+o MemBase - physical address of the linear framebuffer
+o IOBase - physical address of the memory mapped IO registers
+o ChipID - PCI DEVICE ID
6. Driver Options
+o "hw_cursor" - request hardware cursor (default)
+o "sw_cursor" - software cursor only
+o "no_accel" - software rendering only
+o "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
+o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
7. Known Limitations
+o None
8. Authors
The X11R6.8 driver was originally part of XFree86 4.4 rc2.
The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
+o Rickard E. (Rik) Faith <faith@precisioninsight.com>
+o Kevin E. Martin <kevin@precisioninsight.com>
The XFree86 4 driver was funded by ATI and was donated to The XFree86
Project by:
Precision Insight, Inc.
Cedar Park, TX
USA
The XFree86 3.3.x driver used for the port was written by:
+o Rickard E. (Rik) Faith <faith@precisioninsight.com>
+o Kevin E. Martin <kevin@precisioninsight.com>
The XFree86 3.3.x driver was funded by ATI and was donated to The
XFree86 Project by Precision Insight, Inc. It was based in part on
an earlier driver that was written by:
+o Alan Hourihane <alanh@fairlite.demon.co.uk>
+o Dirk Hohndel <hohndel@suse.de>
This early driver was funded and donated to The XFree86 Project by:
SuSE GmbH
Schanzaekerstr. 10
90443 Nuernberg
Germany
http://www.precisioninsight.com
http://www.suse.com

View File

@ -1,138 +0,0 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
<!ENTITY % defs SYSTEM "defs.ent"> %defs;
]>
<article>
<title>Information for ATI Rage 128 Users
<author>Precision Insight, Inc., SuSE GmbH
<date>13 June 2000
<ident>
</ident>
<toc>
<sect>Supported Hardware
<p>
<itemize>
<item>ATI Rage 128 based cards
</itemize>
<sect>Features
<p>
<itemize>
<item>Full support (including hardware accelerated 2D drawing) for 8, 15,
16, 24 bit pixel depths.
<item>Hardware cursor support to reduce sprite flicker.
<item>Support for high resolution video modes up to 1800x1440 @ 70Hz.
<item>Support for doublescan video modes (e.g., 320x200 and 320x240).
<item>Support for gamma correction at all pixel depths.
<item>Fully programmable clock supported.
<item>Robust text mode restore for VT switching.
</itemize>
<sect>Technical Notes
<p>
<itemize>
<item>None
</itemize>
<sect>Reported Working Video Cards
<p>
<itemize>
<item>Rage Fury AGP 32MB
<item>XPERT 128 AGP 16MB
<item>XPERT 99 AGP 8MB
</itemize>
<sect>Configuration
<p>
The driver auto-detects all device information necessary to
initialize the card. The only lines you need in the "Device"
section of your xorg.conf file are:
<verb>
Section "Device"
Identifier "Rage 128"
Driver "r128"
EndSection
</verb>
or let <tt>xorgconfig</tt> do this for you.
However, if you have problems with auto-detection, you can specify:
<itemize>
<item>VideoRam - in kilobytes
<item>MemBase - physical address of the linear framebuffer
<item>IOBase - physical address of the memory mapped IO registers
<item>ChipID - PCI DEVICE ID
</itemize>
<sect>Driver Options
<p>
<itemize>
<item>"hw_cursor" - request hardware cursor (default)
<item>"sw_cursor" - software cursor only
<item>"no_accel" - software rendering only
<item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default)
<item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
</itemize>
<sect>Known Limitations
<p>
<itemize>
<item>None
</itemize>
<sect>Authors
<p>
The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
<itemize>
<item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
<item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
</itemize>
<p>
The XFree86 4 driver was funded by ATI and was donated to The XFree86
Project by:
<verb>
Precision Insight, Inc.
Cedar Park, TX
USA
</verb>
<p>
The XFree86 3.3.x driver used for the port was written by:
<itemize>
<item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
<item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
</itemize>
The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86
Project by Precision Insight, Inc. It was based in part on an earlier
driver that was written by:
<itemize>
<item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email>
<item>Dirk Hohndel <email>hohndel@suse.de</email>
</itemize>
<p>This early driver was funded and donated to The XFree86 Project by:
<verb>
SuSE GmbH
Schanzaekerstr. 10
90443 Nuernberg
Germany
</verb>
<p>
<htmlurl name="http://www.precisioninsight.com"
url="http://www.precisioninsight.com">
<p>
<htmlurl name="http://www.suse.com"
url="http://www.suse.com">
</article>

File diff suppressed because it is too large Load Diff

View File

@ -35,6 +35,10 @@
/* xextproto 7.1 available */
#undef HAVE_XEXTPROTO_71
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
@ -62,14 +66,14 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
/* Enable DRI driver support */
#undef R128DRI
/* Enable developmental DRI driver support */
#undef R128DRI_DEVEL
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Enable DRI driver support */
#undef XF86DRI
/* Enable developmental DRI driver support */
#undef XF86DRI_DEVEL

File diff suppressed because it is too large Load Diff

View File

@ -20,28 +20,30 @@
#
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.57)
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-r128],
6.8.1,
[6.8.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-r128)
[xf86-video-r128])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_MAINTAINER_MODE
# Checks for programs.
# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
if test "x$GCC" = "xyes"; then
CPPFLAGS="$CPPFLAGS -Wall"
@ -49,38 +51,35 @@ fi
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
if test "$DRI" != no; then
AC_CHECK_FILE([${sdkdir}/dri.h],
[have_dri_h="yes"], [have_dri_h="no"])
@ -107,8 +106,8 @@ AC_MSG_RESULT([$DRI])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
AC_DEFINE(R128DRI,1,[Enable DRI driver support])
AC_DEFINE(R128DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
SAVE_CPPFLAGS="$CPPFLAGS"
@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([XORG_CFLAGS])
AC_SUBST([DRI_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=r128
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHECK_LINUXDOC
XORG_CHANGELOG
AC_MSG_NOTICE(
[Please change the Driver line in xorg.conf from "ati" to "r128" or install]
[the ati wrapper as well:]
[ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
)
AC_OUTPUT([
Makefile
src/Makefile
man/Makefile
AC_CONFIG_FILES([
Makefile
src/Makefile
man/Makefile
])
AC_OUTPUT

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +1,25 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)
@ -34,25 +31,11 @@ EXTRA_DIST = r128.man
CLEANFILES = $(driverman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

View File

@ -15,30 +15,27 @@
@SET_MAKE@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -49,9 +46,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -96,23 +94,18 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
@ -121,44 +114,47 @@ DRI_FALSE = @DRI_FALSE@
DRI_LIBS = @DRI_LIBS@
DRI_TRUE = @DRI_TRUE@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINUXDOC = @LINUXDOC@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_HTML = @MAKE_HTML@
MAKE_PDF = @MAKE_PDF@
MAKE_PS = @MAKE_PS@
MAKE_TEXT = @MAKE_TEXT@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -169,11 +165,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
SED = sed
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
USE_EXA_FALSE = @USE_EXA_FALSE@
USE_EXA_TRUE = @USE_EXA_TRUE@
@ -182,15 +178,14 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -204,7 +199,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -239,21 +233,7 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = r128.man
CLEANFILES = $(driverman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am
@ -268,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
$(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -440,7 +420,7 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
.man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,4 +1,3 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH R128 __drivermansuffix__ __vendorversion__

View File

@ -50,9 +50,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -111,6 +111,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -118,23 +119,18 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
@ -143,44 +139,47 @@ DRI_FALSE = @DRI_FALSE@
DRI_LIBS = @DRI_LIBS@
DRI_TRUE = @DRI_TRUE@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINUXDOC = @LINUXDOC@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_HTML = @MAKE_HTML@
MAKE_PDF = @MAKE_PDF@
MAKE_PS = @MAKE_PS@
MAKE_TEXT = @MAKE_TEXT@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -191,11 +190,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
USE_EXA_FALSE = @USE_EXA_FALSE@
USE_EXA_TRUE = @USE_EXA_TRUE@
@ -204,15 +203,14 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -226,7 +224,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -288,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

View File

@ -34,6 +34,33 @@ enum region_type {
REGION_IO
};
#include "xf86Module.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
#define PCI_DOM_MASK 0x01fful
#else
#define PCI_DOM_MASK 0x0ffu
#endif
#ifndef PCI_DOM_MASK
# define PCI_DOM_MASK 0x0ffu
#endif
#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
static inline uint32_t
pciTag(int busnum, int devnum, int funcnum)
{
uint32_t tag;
tag = (busnum & (PCI_DOMBUS_MASK)) << 16;
tag |= (devnum & 0x00001fu) << 11;
tag |= (funcnum & 0x000007u) << 8;
return tag;
}
#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
#ifndef XSERVER_LIBPCIACCESS
/* pciVideoPtr */

View File

@ -56,7 +56,11 @@
#include "r128_probe.h"
/* DRI support */
#ifdef XF86DRI
#ifndef XF86DRI
#undef R128DRI
#endif
#if R128DRI
#define _XF86DRI_SERVER_
#include "r128_dripriv.h"
#include "dri.h"
@ -303,14 +307,14 @@ typedef struct {
int scanline_y;
int scanline_w;
int scanline_h;
#ifdef XF86DRI
#ifdef R128DRI
int scanline_hpass;
int scanline_x1clip;
int scanline_x2clip;
int scanline_rop;
int scanline_fg;
int scanline_bg;
#endif /* XF86DRI */
#endif /* R128DRI */
int scanline_words;
int scanline_direct;
int scanline_bpp; /* Only used for ImageWrite */
@ -322,7 +326,7 @@ typedef struct {
DGAFunctionRec DGAFuncs;
R128FBLayout CurrentLayout;
#ifdef XF86DRI
#ifdef R128DRI
Bool directRenderingEnabled;
DRIInfoPtr pDRIInfo;
int drmFD;
@ -474,7 +478,7 @@ extern int R128MinBits(int val);
extern void R128InitVideo(ScreenPtr pScreen);
#ifdef XF86DRI
#ifdef R128DRI
extern Bool R128DRIScreenInit(ScreenPtr pScreen);
extern void R128DRICloseScreen(ScreenPtr pScreen);
extern Bool R128DRIFinishScreenInit(ScreenPtr pScreen);

View File

@ -88,7 +88,7 @@
#include "r128.h"
#include "r128_reg.h"
#include "r128_probe.h"
#ifdef XF86DRI
#ifdef R128DRI
#include "r128_sarea.h"
#define _XF86DRI_SERVER_
#include "r128_dri.h"
@ -187,7 +187,7 @@ void R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"FIFO timed out, resetting engine...\n");
R128EngineReset(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
R128CCE_RESET(pScrn, info);
if (info->directRenderingEnabled) {
R128CCE_START(pScrn, info);
@ -220,11 +220,11 @@ void R128WaitForIdle(ScrnInfoPtr pScrn)
INREG(R128_GUI_PROBE)));
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Idle timed out, resetting engine...\n");
#ifdef XF86DRI
#ifdef R128DRI
R128CCE_STOP(pScrn, info);
#endif
R128EngineReset(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
R128CCE_RESET(pScrn, info);
if (info->directRenderingEnabled) {
R128CCE_START(pScrn, info);
@ -233,7 +233,7 @@ void R128WaitForIdle(ScrnInfoPtr pScrn)
}
}
#ifdef XF86DRI
#ifdef R128DRI
/* Wait until the CCE is completely idle: the FIFO has drained and the
* CCE is idle.
*/
@ -1069,7 +1069,7 @@ void R128EngineInit(ScrnInfoPtr pScrn)
/* FIXME: this is a kludge for texture uploads in the 3D driver. Look at
* how the radeon driver handles HOST_DATA_SWAP if you want to implement
* CCE ImageWrite acceleration or anything needing this bit */
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled)
OUTREGP(R128_DP_DATATYPE, 0, ~R128_HOST_BIG_ENDIAN_EN);
else
@ -1080,7 +1080,7 @@ void R128EngineInit(ScrnInfoPtr pScrn)
OUTREGP(R128_DP_DATATYPE, 0, ~R128_HOST_BIG_ENDIAN_EN);
#endif
#ifdef XF86DRI
#ifdef R128DRI
info->sc_left = 0x00000000;
info->sc_right = R128_DEFAULT_SC_RIGHT_MAX;
info->sc_top = 0x00000000;
@ -1096,7 +1096,7 @@ void R128EngineInit(ScrnInfoPtr pScrn)
R128WaitForIdle(pScrn);
}
#ifdef XF86DRI
#ifdef R128DRI
/* Setup for XAA SolidFill. */
static void R128CCESetupForSolidFill(ScrnInfoPtr pScrn,
@ -1804,7 +1804,7 @@ static void R128MMIOAccelInit(ScrnInfoPtr pScrn, XAAInfoRecPtr a)
| LEFT_EDGE_CLIPPING_NEGATIVE_X;
a->NumScanlineColorExpandBuffers = 1;
a->ScanlineColorExpandBuffers = info->scratch_buffer;
info->scratch_save = xalloc(((pScrn->virtualX+31)/32*4)
info->scratch_save = malloc(((pScrn->virtualX+31)/32*4)
+ (pScrn->virtualX
* info->CurrentLayout.pixel_bytes));
info->scratch_buffer[0] = info->scratch_save;
@ -1866,9 +1866,12 @@ Bool R128AccelInit(ScreenPtr pScreen)
R128InfoPtr info = R128PTR(pScrn);
XAAInfoRecPtr a;
if (!xf86LoadSubModule(pScrn, "xaa"))
return FALSE;
if (!(a = info->accel = XAACreateInfoRec())) return FALSE;
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled)
R128CCEAccelInit(pScrn, a);
else

View File

@ -20,7 +20,7 @@
/* DGA support */
#include "dgaproc.h"
#ifdef XF86DRI
#ifdef R128DRI
#include "r128_common.h"
#endif
@ -69,7 +69,7 @@ SECOND_PASS:
if (secondPitch)
pitch = secondPitch;
if (!(newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec))))
if (!(newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec))))
break;
modes = newmodes;
@ -244,14 +244,14 @@ R128_SetMode(
pScrn->currentMode = info->CurrentLayout.mode;
pScrn->SwitchMode(indx, pScrn->currentMode, 0);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
R128CCE_STOP(pScrn, info);
}
#endif
if (info->accelOn)
R128EngineInit(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
R128CCE_START(pScrn, info);
}
@ -276,14 +276,14 @@ R128_SetMode(
pScrn->SwitchMode(indx, pMode->mode, 0);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
R128CCE_STOP(pScrn, info);
}
#endif
if (info->accelOn)
R128EngineInit(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
R128CCE_START(pScrn, info);
}

View File

@ -105,21 +105,21 @@ static Bool R128InitVisualConfigs(ScreenPtr pScreen)
if (R128_USE_DB) numConfigs *= 2;
if (!(pConfigs
= (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
= (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
numConfigs))) {
return FALSE;
}
if (!(pR128Configs
= (R128ConfigPrivPtr)xcalloc(sizeof(R128ConfigPrivRec),
= (R128ConfigPrivPtr)calloc(sizeof(R128ConfigPrivRec),
numConfigs))) {
xfree(pConfigs);
free(pConfigs);
return FALSE;
}
if (!(pR128ConfigPtrs
= (R128ConfigPrivPtr*)xcalloc(sizeof(R128ConfigPrivPtr),
= (R128ConfigPrivPtr*)calloc(sizeof(R128ConfigPrivPtr),
numConfigs))) {
xfree(pConfigs);
xfree(pR128Configs);
free(pConfigs);
free(pR128Configs);
return FALSE;
}
@ -188,21 +188,21 @@ static Bool R128InitVisualConfigs(ScreenPtr pScreen)
if (R128_USE_DB) numConfigs *= 2;
if (!(pConfigs
= (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
= (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
numConfigs))) {
return FALSE;
}
if (!(pR128Configs
= (R128ConfigPrivPtr)xcalloc(sizeof(R128ConfigPrivRec),
= (R128ConfigPrivPtr)calloc(sizeof(R128ConfigPrivRec),
numConfigs))) {
xfree(pConfigs);
free(pConfigs);
return FALSE;
}
if (!(pR128ConfigPtrs
= (R128ConfigPrivPtr*)xcalloc(sizeof(R128ConfigPrivPtr),
= (R128ConfigPrivPtr*)calloc(sizeof(R128ConfigPrivPtr),
numConfigs))) {
xfree(pConfigs);
xfree(pR128Configs);
free(pConfigs);
free(pR128Configs);
return FALSE;
}
@ -1026,7 +1026,7 @@ Bool R128DRIScreenInit(ScreenPtr pScreen)
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(info->PciInfo);
} else {
pDRIInfo->busIdString = xalloc(64);
pDRIInfo->busIdString = malloc(64);
sprintf(pDRIInfo->busIdString,
"PCI:%d:%d:%d",
PCI_DEV_BUS(info->PciInfo),
@ -1065,7 +1065,7 @@ Bool R128DRIScreenInit(ScreenPtr pScreen)
pDRIInfo->SAREASize = SAREA_MAX;
#endif
if (!(pR128DRI = (R128DRIPtr)xcalloc(sizeof(R128DRIRec),1))) {
if (!(pR128DRI = (R128DRIPtr)calloc(sizeof(R128DRIRec),1))) {
DRIDestroyInfoRec(info->pDRIInfo);
info->pDRIInfo = NULL;
return FALSE;
@ -1091,7 +1091,7 @@ Bool R128DRIScreenInit(ScreenPtr pScreen)
if (!DRIScreenInit(pScreen, pDRIInfo, &info->drmFD)) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[dri] DRIScreenInit failed. Disabling DRI.\n");
xfree(pDRIInfo->devPrivate);
free(pDRIInfo->devPrivate);
pDRIInfo->devPrivate = NULL;
DRIDestroyInfoRec(pDRIInfo);
pDRIInfo = NULL;
@ -1352,18 +1352,18 @@ void R128DRICloseScreen(ScreenPtr pScreen)
/* De-allocate all DRI data structures */
if (info->pDRIInfo) {
if (info->pDRIInfo->devPrivate) {
xfree(info->pDRIInfo->devPrivate);
free(info->pDRIInfo->devPrivate);
info->pDRIInfo->devPrivate = NULL;
}
DRIDestroyInfoRec(info->pDRIInfo);
info->pDRIInfo = NULL;
}
if (info->pVisualConfigs) {
xfree(info->pVisualConfigs);
free(info->pVisualConfigs);
info->pVisualConfigs = NULL;
}
if (info->pVisualConfigsPriv) {
xfree(info->pVisualConfigsPriv);
free(info->pVisualConfigsPriv);
info->pVisualConfigsPriv = NULL;
}
}

View File

@ -71,7 +71,7 @@
#include "r128_reg.h"
#include "r128_version.h"
#ifdef XF86DRI
#ifdef R128DRI
#define _XF86DRI_SERVER_
#include "r128_dri.h"
#include "r128_common.h"
@ -133,7 +133,7 @@ typedef enum {
OPTION_SW_CURSOR,
OPTION_DAC_6BIT,
OPTION_DAC_8BIT,
#ifdef XF86DRI
#ifdef R128DRI
OPTION_XV_DMA,
OPTION_IS_PCI,
OPTION_CCE_PIO,
@ -164,7 +164,7 @@ static const OptionInfoRec R128Options[] = {
{ OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DAC_6BIT, "Dac6Bit", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DAC_8BIT, "Dac8Bit", OPTV_BOOLEAN, {0}, TRUE },
#ifdef XF86DRI
#ifdef R128DRI
{ OPTION_XV_DMA, "DMAForXv", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_IS_PCI, "ForcePCIMode", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_CCE_PIO, "CCEPIOMode", OPTV_BOOLEAN, {0}, FALSE },
@ -228,7 +228,7 @@ static Bool R128GetRec(ScrnInfoPtr pScrn)
static void R128FreeRec(ScrnInfoPtr pScrn)
{
if (!pScrn || !pScrn->driverPrivate) return;
xfree(pScrn->driverPrivate);
free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@ -506,9 +506,9 @@ static Bool R128GetBIOSParameters(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
#ifdef XSERVER_LIBPCIACCESS
int size = info->PciInfo->rom_size > R128_VBIOS_SIZE ? info->PciInfo->rom_size : R128_VBIOS_SIZE;
info->VBIOS = xalloc(size);
info->VBIOS = malloc(size);
#else
info->VBIOS = xalloc(R128_VBIOS_SIZE);
info->VBIOS = malloc(R128_VBIOS_SIZE);
#endif
if (!info->VBIOS) {
@ -541,7 +541,7 @@ static Bool R128GetBIOSParameters(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
}
if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
info->BIOSAddr = 0x00000000;
xfree(info->VBIOS);
free(info->VBIOS);
info->VBIOS = NULL;
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Video BIOS not found!\n");
@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
/* BIOS */
from = X_PROBED;
info->BIOSAddr = info->PciInfo->biosBase & 0xfffe0000;
if (dev->BiosBase) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"BIOS address override, using 0x%08lx instead of 0x%08lx\n",
dev->BiosBase,
info->BIOSAddr);
info->BIOSAddr = dev->BiosBase;
from = X_CONFIG;
}
if (info->BIOSAddr) {
xf86DrvMsg(pScrn->scrnIndex, from,
"BIOS at 0x%08lx\n", info->BIOSAddr);
@ -1183,7 +1175,7 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
}
}
#ifdef XF86DRI
#ifdef R128DRI
/* DMA for Xv */
info->DMAForXv = xf86ReturnOptValBool(info->Options, OPTION_XV_DMA, FALSE);
if (info->DMAForXv) {
@ -1527,7 +1519,7 @@ static void R128SetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag)
}
/***********
xfree's xf86ValidateModes routine deosn't work well with DFPs
free's xf86ValidateModes routine deosn't work well with DFPs
here is our own validation routine. All modes between
640<=XRes<=MaxRes and 480<=YRes<=MaxYRes will be permitted.
NOTE: RageProII doesn't support rmx, can only work with the
@ -1761,17 +1753,6 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn)
return TRUE;
}
/* This is called by R128PreInit to initialize hardware acceleration. */
static Bool R128PreInitAccel(ScrnInfoPtr pScrn)
{
R128InfoPtr info = R128PTR(pScrn);
if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE;
}
return TRUE;
}
static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
{
R128InfoPtr info = R128PTR(pScrn);
@ -1785,7 +1766,7 @@ static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
return TRUE;
}
#ifdef XF86DRI
#ifdef R128DRI
static Bool R128PreInitDRI(ScrnInfoPtr pScrn)
{
R128InfoPtr info = R128PTR(pScrn);
@ -1995,7 +1976,7 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
/* We can't do this until we have a
pScrn->display. */
xf86CollectOptions(pScrn, NULL);
if (!(info->Options = xalloc(sizeof(R128Options)))) goto fail;
if (!(info->Options = malloc(sizeof(R128Options)))) goto fail;
memcpy(info->Options, R128Options, sizeof(R128Options));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
@ -2021,8 +2002,10 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
} else
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE,"
" VGA module load skipped\n");
if (info->VGAAccess)
if (info->VGAAccess) {
vgaHWSetStdFuncs(VGAHWPTR(pScrn));
vgaHWGetIOBase(VGAHWPTR(pScrn));
}
#else
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAHW support not compiled, VGA "
"module load skipped\n");
@ -2082,15 +2065,13 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
if (!R128PreInitCursor(pScrn)) goto fail;
if (!R128PreInitAccel(pScrn)) goto fail;
#ifdef XF86DRI
#ifdef R128DRI
if (!R128PreInitDRI(pScrn)) goto fail;
#endif
/* Free the video bios (if applicable) */
if (info->VBIOS) {
xfree(info->VBIOS);
free(info->VBIOS);
info->VBIOS = NULL;
}
@ -2109,7 +2090,7 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
/* Free the video bios (if applicable) */
if (info->VBIOS) {
xfree(info->VBIOS);
free(info->VBIOS);
info->VBIOS = NULL;
}
@ -2190,7 +2171,7 @@ R128BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
ScrnInfoPtr pScrn = xf86Screens[i];
R128InfoPtr info = R128PTR(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled)
FLUSH_RING();
#endif
@ -2212,10 +2193,11 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
R128InfoPtr info = R128PTR(pScrn);
BoxRec MemBox;
int y2;
Bool noAccel;
R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset));
#ifdef XF86DRI
#ifdef R128DRI
/* Turn off the CCE for now. */
info->CCEInUse = FALSE;
info->indirectBuffer = NULL;
@ -2224,7 +2206,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
if (!R128MapMem(pScrn)) return FALSE;
pScrn->fbOffset = 0;
if(info->IsSecondary) pScrn->fbOffset = pScrn->videoRam * 1024;
#ifdef XF86DRI
#ifdef R128DRI
info->fbX = 0;
info->fbY = 0;
info->frontOffset = 0;
@ -2251,7 +2233,9 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
pScrn->defaultVisual)) return FALSE;
miSetPixmapDepths ();
#ifdef XF86DRI
noAccel = xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE);
#ifdef R128DRI
/* Setup DRI after visuals have been
established, but before fbScreenInit is
called. fbScreenInit will eventually
@ -2265,7 +2249,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
info->CurrentLayout.pixel_bytes);
int maxy = info->FbMapSize / width_bytes;
if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
if (noAccel) {
xf86DrvMsg(scrnIndex, X_WARNING,
"Acceleration disabled, not initializing the DRI\n");
info->directRenderingEnabled = FALSE;
@ -2336,7 +2320,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
fbPictureInit (pScreen, 0, 0);
/* Memory manager setup */
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
FBAreaPtr fbarea;
int width_bytes = (pScrn->displayWidth *
@ -2549,7 +2533,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
}
/* Acceleration setup */
if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
if (!noAccel) {
if (R128AccelInit(pScreen)) {
xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
info->accelOn = TRUE;
@ -2638,7 +2622,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
#ifdef XF86DRI
#ifdef R128DRI
/* DRI finalization */
if (info->directRenderingEnabled) {
/* Now that mi, fb, drm and others have
@ -3368,7 +3352,7 @@ static void R128InitCommonRegisters(R128SavePtr save, R128InfoPtr info)
save->subpic_cntl = 0;
save->viph_control = 0;
save->i2c_cntl_1 = 0;
#ifdef XF86DRI
#ifdef R128DRI
save->gen_int_cntl = info->gen_int_cntl;
#else
save->gen_int_cntl = 0;
@ -4251,7 +4235,7 @@ Bool R128EnterVT(int scrnIndex, int flags)
if (info->accelOn)
R128EngineInit(pScrn);
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
if (info->irq) {
/* Need to make sure interrupts are enabled */
@ -4278,7 +4262,7 @@ void R128LeaveVT(int scrnIndex, int flags)
R128SavePtr save = &info->ModeReg;
R128TRACE(("R128LeaveVT\n"));
#ifdef XF86DRI
#ifdef R128DRI
if (info->directRenderingEnabled) {
DRILock(pScrn->pScreen, 0);
R128CCE_STOP(pScrn, info);
@ -4303,7 +4287,7 @@ static Bool R128CloseScreen(int scrnIndex, ScreenPtr pScreen)
R128TRACE(("R128CloseScreen\n"));
#ifdef XF86DRI
#ifdef R128DRI
/* Disable direct rendering */
if (info->directRenderingEnabled) {
R128DRICloseScreen(pScreen);
@ -4319,17 +4303,17 @@ static Bool R128CloseScreen(int scrnIndex, ScreenPtr pScreen)
if (info->accel) XAADestroyInfoRec(info->accel);
info->accel = NULL;
if (info->scratch_save) xfree(info->scratch_save);
if (info->scratch_save) free(info->scratch_save);
info->scratch_save = NULL;
if (info->cursor) xf86DestroyCursorInfoRec(info->cursor);
info->cursor = NULL;
if (info->DGAModes) xfree(info->DGAModes);
if (info->DGAModes) free(info->DGAModes);
info->DGAModes = NULL;
if (info->adaptor) {
xfree(info->adaptor->pPortPrivates[0].ptr);
free(info->adaptor->pPortPrivates[0].ptr);
xf86XVFreeVideoAdaptorRec(info->adaptor);
info->adaptor = NULL;
}

View File

@ -298,7 +298,7 @@ r128_get_scrninfo(int entity_num)
instance++;
}
xfree(pEnt);
free(pEnt);
return TRUE;
}
@ -340,8 +340,8 @@ R128Probe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
xfree(usedChips);
xfree(devSections);
free(usedChips);
free(devSections);
return foundScreen;
}

View File

@ -8,7 +8,7 @@
#include "r128.h"
#include "r128_reg.h"
#ifdef XF86DRI
#ifdef R128DRI
#include "r128_common.h"
#include "r128_sarea.h"
#endif
@ -95,7 +95,7 @@ void R128InitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@ -110,7 +110,7 @@ void R128InitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(newAdaptors)
xfree(newAdaptors);
free(newAdaptors);
}
#define MAXWIDTH 2048
@ -188,9 +188,9 @@ R128AllocAdaptor(ScrnInfoPtr pScrn)
if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
if(!(pPriv = xcalloc(1, sizeof(R128PortPrivRec) + sizeof(DevUnion))))
if(!(pPriv = calloc(1, sizeof(R128PortPrivRec) + sizeof(DevUnion))))
{
xfree(adapt);
free(adapt);
return NULL;
}
@ -392,7 +392,7 @@ R128DMA(
int w
){
#ifdef XF86DRI
#ifdef R128DRI
#define BUFSIZE (R128_BUFFER_SIZE - R128_HOSTDATA_BLIT_OFFSET)
#define MAXPASSES (MAXHEIGHT/(BUFSIZE/(MAXWIDTH*2))+1)
@ -481,10 +481,10 @@ R128DMA(
#else
/* This is to avoid cluttering the rest of the code with '#ifdef XF86DRI' */
/* This is to avoid cluttering the rest of the code with '#ifdef R128DRI' */
return FALSE;
#endif /* XF86DRI */
#endif /* R128DRI */
}