ChangeLog | 2182 ++++++++++++++
Makefile.am | 11
Makefile.in | 8
README.ati | 828 -----
README.ati.sgml | 648 ----
README.r128 | 160 -
README.r128.sgml | 138
aclocal.m4 | 14
config.h.in | 18
configure | 356 +-
configure.ac | 83
debian/NEWS | 9
debian/changelog | 72
debian/control | 69
debian/patches/01_gen_pci_ids.diff | 8
debian/rules | 6
debian/xserver-xorg-video-ati.install | 4
debian/xserver-xorg-video-ati.manpages | 2
debian/xserver-xorg-video-radeon.install | 3
debian/xserver-xorg-video-radeon.links | 1
debian/xserver-xorg-video-radeon.manpages | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150 -
debian/xsfbs/xsfbs.mk | 102
debian/xsfbs/xsfbs.sh | 394 +-
ltmain.sh | 2
man/Makefile.am | 5
man/Makefile.in | 5
man/r128.man | 156 -
man/radeon.man | 40
src/AtomBios/CD_Operations.c | 9
src/AtomBios/Decoder.c | 9
src/AtomBios/includes/CD_Common_Types.h | 8
src/AtomBios/includes/ObjectID.h | 928 +++---
src/AtomBios/includes/atombios.h | 50
src/Makefile.am | 91
src/Makefile.in | 305 --
src/ati.c | 6
src/ati.h | 3
src/ati_pciids_gen.h | 28
src/atiadjust.c | 134
src/atiadjust.h | 31
src/atiaudio.c | 50
src/atiaudio.h | 51
src/atibank.c | 114
src/atibank.h | 44
src/atibus.c | 123
src/atibus.h | 49
src/atichip.c | 271 -
src/atichip.h | 94
src/aticlock.c | 443 --
src/aticlock.h | 62
src/aticonfig.c | 506 ---
src/aticonsole.c | 816 -----
src/aticonsole.h | 43
src/aticrtc.h | 42
src/aticursor.h | 42
src/atidac.c | 462 ---
src/atidac.h | 99
src/atidecoder.c | 50
src/atidecoder.h | 51
src/atidga.c | 483 ---
src/atidga.h | 36
src/atidri.c | 1640 -----------
src/atidri.h | 49
src/atidripriv.h | 57
src/atidsp.c | 302 --
src/atidsp.h | 35
src/atii2c.c | 399 --
src/atii2c.h | 48
src/atiload.c | 98
src/atiload.h | 32
src/atilock.c | 537 ---
src/atilock.h | 31
src/atimach64.c | 1341 ---------
src/atimach64.h | 36
src/atimach64accel.c | 1068 -------
src/atimach64accel.h | 42
src/atimach64cursor.c | 426 --
src/atimach64exa.c | 696 ----
src/atimach64i2c.c | 469 ---
src/atimach64i2c.h | 32
src/atimach64io.c | 103
src/atimach64io.h | 421 --
src/atimach64probe.c | 289 -
src/atimach64probe.h | 32
src/atimach64render.c | 898 ------
src/atimach64version.h | 59
src/atimach64xv.c | 1686 -----------
src/atimisc.c | 78
src/atimode.c | 1084 -------
src/atimode.h | 35
src/atimodule.c | 2
src/atioption.h | 98
src/atipreinit.c | 2509 ----------------
src/atipreinit.h | 30
src/atiprint.c | 784 -----
src/atiprint.h | 34
src/atipriv.h | 30
src/atiprobe.c | 475 ---
src/atiprobe.h | 30
src/atiregs.h | 2882 -------------------
src/atirgb514.c | 283 -
src/atirgb514.h | 35
src/atiscreen.c | 692 ----
src/atiscreen.h | 31
src/atistruct.h | 529 ---
src/atituner.c | 177 -
src/atituner.h | 69
src/atiutil.c | 117
src/atiutil.h | 67
src/ativalid.c | 161 -
src/ativalid.h | 30
src/ativga.c | 195 -
src/ativga.h | 40
src/ativgaio.c | 49
src/ativgaio.h | 56
src/atividmem.c | 483 ---
src/atividmem.h | 73
src/atiwonder.c | 159 -
src/atiwonder.h | 38
src/atiwonderio.c | 66
src/atiwonderio.h | 46
src/atixv.h | 34
src/atombios_crtc.c | 207 -
src/atombios_output.c | 499 +++
src/generic_bus.h | 9
src/legacy_crtc.c | 187 -
src/legacy_output.c | 189 +
src/mach64_common.h | 130
src/mach64_dri.h | 125
src/mach64_sarea.h | 162 -
src/pcidb/ati_pciids.csv | 48
src/r128.h | 606 ----
src/r128_accel.c | 1880 ------------
src/r128_common.h | 169 -
src/r128_cursor.c | 311 --
src/r128_dga.c | 402 --
src/r128_dri.c | 1499 ----------
src/r128_dri.h | 100
src/r128_dripriv.h | 57
src/r128_driver.c | 4463 ------------------------------
src/r128_misc.c | 79
src/r128_probe.c | 378 --
src/r128_probe.h | 73
src/r128_reg.h | 1533 ----------
src/r128_sarea.h | 194 -
src/r128_version.h | 59
src/r128_video.c | 1028 ------
src/radeon.h | 622 ++--
src/radeon_accel.c | 164 -
src/radeon_accelfuncs.c | 19
src/radeon_atombios.c | 1283 ++------
src/radeon_atombios.h | 13
src/radeon_atomwrapper.c | 2
src/radeon_bios.c | 411 ++
src/radeon_chipinfo_gen.h | 36
src/radeon_chipset_gen.h | 40
src/radeon_common.h | 2
src/radeon_commonfuncs.c | 671 +++-
src/radeon_crtc.c | 126
src/radeon_cursor.c | 53
src/radeon_dga.c | 10
src/radeon_dri.c | 37
src/radeon_dri.h | 2
src/radeon_driver.c | 1111 +++++--
src/radeon_exa.c | 52
src/radeon_exa_funcs.c | 66
src/radeon_exa_render.c | 1376 +++++++--
src/radeon_macros.h | 20
src/radeon_mm_i2c.c | 22
src/radeon_output.c | 553 ++-
src/radeon_pci_chipset_gen.h | 28
src/radeon_pci_device_match_gen.h | 28
src/radeon_probe.c | 2
src/radeon_probe.h | 503 +--
src/radeon_reg.h | 1272 ++++++++
src/radeon_render.c | 73
src/radeon_textured_video.c | 401 ++
src/radeon_textured_videofuncs.c | 647 ++++
src/radeon_tv.c | 100
src/radeon_video.c | 342 +-
src/radeon_video.h | 70
src/radeon_vip.c | 42
src/theatre.c | 310 +-
src/theatre.h | 116
src/theatre200.c | 356 +-
src/theatre_detect.c | 17
src/theatre_detect.h | 4
src/theatre_reg.h | 306 +-
189 files changed, 12125 insertions(+), 46905 deletions(-)
New commits:
commit 58780160e26a8cb637e17eca3d68ab4909825439
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Jun 19 08:00:20 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index cce3b75..a84b773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:6.8.191-2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.8.191-2) unstable; urgency=low
* Split the package into into the -ati package containing the ati driver
wrapper, and xserver-xorg-video-radeon containing the actual radeon
@@ -6,7 +6,7 @@ xserver-xorg-video-ati (1:6.8.191-2) UNRELEASED; urgency=low
xserver-xorg-video-ati now depends on -r128, -mach64 and -radeon
while -ati-dbg depends on their corresponding -dbg packages.
- -- Brice Goglin <[EMAIL PROTECTED]> Wed, 18 Jun 2008 16:29:14 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Thu, 19 Jun 2008 07:59:57 +0200
xserver-xorg-video-ati (1:6.8.191-1) unstable; urgency=low
commit b9847d8e5cce0ebade545ce57d5e0bf50f4da565
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Jun 18 16:34:37 2008 +0200
Split a -radeon binary package out of -ati
diff --git a/debian/changelog b/debian/changelog
index 0d7e840..cce3b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-ati (1:6.8.191-2) UNRELEASED; urgency=low
+
+ * Split the package into into the -ati package containing the ati driver
+ wrapper, and xserver-xorg-video-radeon containing the actual radeon
+ sub-driver.
+ xserver-xorg-video-ati now depends on -r128, -mach64 and -radeon
+ while -ati-dbg depends on their corresponding -dbg packages.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Wed, 18 Jun 2008 16:29:14 +0200
+
xserver-xorg-video-ati (1:6.8.191-1) unstable; urgency=low
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index b6277b7..284da4d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,43 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
Package: xserver-xorg-video-ati
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
xserver-xorg-video-r128, xserver-xorg-video-mach64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
xserver-xorg-video-r128, xserver-xorg-video-mach64, xserver-xorg-video-radeon
+Description: X.Org X server -- ATI display driver wrapper
+ This driver for the X.Org X server (see xserver-xorg for a further
description)
+ provides support for the ATI Mach64, Rage128, Radeon and FireGL series.
+ It provides the 'ati' driver wrapper which loads one of the 'mach64', 'r128'
+ or 'ati' sub-drivers depending on the hardware. These sub-drivers are brought
+ through package dependencies.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xf86-video-ati driver module.
+
+Package: xserver-xorg-video-ati-dbg
+Architecture: any
+Depends: xserver-xorg-video-ati (= ${binary:Version}),
xserver-xorg-video-mach64-dbg, xserver-xorg-video-r128-dbg,
xserver-xorg-video-radeon-dbg,
+Priority: extra
+Description: X.Org X server -- ATI display driver wrapper (debugging symbols)
+ This driver for the X.Org X server (see xserver-xorg for a further
description)
+ provides support for the ATI Mach64, Rage128, Radeon and FireGL series.
+ It provides the 'ati' driver wrapper which loads one of the 'mach64', 'r128'
+ or 'ati' sub-drivers depending on the hardware.
+ .
+ This package provides debugging symbols for the Xorg X server ATI display
+ driver wrapper and brings debugging symbols for these sub-drivers through
+ package dependencies.
+
+Package: xserver-xorg-video-radeon
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Description: X.Org X server -- ATI display driver
+Description: X.Org X server -- ATI Radeon display driver
This driver for the X.Org X server (see xserver-xorg for a further
description)
provides support for the ATI Radeon and FireGL series. It provides the
'radeon'
- sub-driver.
+ driver.
.
Note that this is not the same as the ATI-provided, binary-only, 'fglrx'
driver, which provides additional 3D functionality for some newer Radeon
@@ -30,16 +61,16 @@ Description: X.Org X server -- ATI display driver
.
This package is built from the X.org xf86-video-ati driver module.
-Package: xserver-xorg-video-ati-dbg
+Package: xserver-xorg-video-radeon-dbg
Architecture: any
-Depends: xserver-xorg-video-ati (= ${binary:Version})
+Depends: xserver-xorg-video-radeon (= ${binary:Version})
Priority: extra
-Description: X.Org X server -- ATI display driver (debugging symbols)
+Description: X.Org X server -- ATI Radeon display driver (debugging symbols)
This driver for the X.Org X server (see xserver-xorg for a further
description)
provides support for the ATI Radeon and FireGL series. It provides the
'radeon'
- sub-driver.
+ driver.
.
This driver provides support for Radeon and FireGL series ATI cards.
.
- This package provides debugging symbols for the Xorg X server ATI display
- driver.
+ This package provides debugging symbols for the Xorg X server ATI Radeon
+ display driver.
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
index 7a7dfe7..5160ff7 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -12,7 +12,7 @@ Index: xserver-xorg-video-ati/src/Makefile.am
radeon_atombios.h
+
+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = ati.ids
++pcidata_DATA = radeon.ids
+
-+ati.ids: ati_pciids_gen.h
-+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed
-e 's/0x/1002/' > ati.ids
++radeon.ids: ati_pciids_gen.h
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed
-e 's/0x/1002/' > radeon.ids
diff --git a/debian/rules b/debian/rules
index c80f62c..28b1db1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,11 +75,13 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=usr/share/man/man4
dh_installman
dh_link
- dh_strip --dbg-package=xserver-xorg-video-ati-dbg
+ dh_strip -pxserver-xorg-video-ati
--dbg-package=xserver-xorg-video-ati-dbg
+ dh_strip -pxserver-xorg-video-radeon
--dbg-package=xserver-xorg-video-radeon-dbg
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps -- --warnings=6
+ cp -f debian/xserver-xorg-video-ati.substvars
debian/xserver-xorg-video-radeon.substvars # xsfbs serverabi hack
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/xserver-xorg-video-ati.install
b/debian/xserver-xorg-video-ati.install
index 71bacbe..f825193 100644
--- a/debian/xserver-xorg-video-ati.install
+++ b/debian/xserver-xorg-video-ati.install
@@ -1,3 +1 @@
-usr/lib/xorg/modules/drivers/*.so
-usr/lib/xorg/modules/multimedia/*.so
-usr/share/xserver-xorg/pci/*
+usr/lib/xorg/modules/drivers/ati_drv.so
diff --git a/debian/xserver-xorg-video-ati.manpages
b/debian/xserver-xorg-video-ati.manpages
index 603f9bd..9491a85 100644
--- a/debian/xserver-xorg-video-ati.manpages
+++ b/debian/xserver-xorg-video-ati.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man4/*
+debian/tmp/usr/share/man/man4/ati.4
diff --git a/debian/xserver-xorg-video-radeon.install
b/debian/xserver-xorg-video-radeon.install
new file mode 100644
index 0000000..a2bc59b
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.install
@@ -0,0 +1,3 @@
+usr/lib/xorg/modules/drivers/radeon_drv.so
+usr/lib/xorg/modules/multimedia/*.so
+usr/share/xserver-xorg/pci/*
diff --git a/debian/xserver-xorg-video-radeon.links
b/debian/xserver-xorg-video-radeon.links
new file mode 100644
index 0000000..c988a36
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script
usr/share/bug/xserver-xorg-video-radeon/script
diff --git a/debian/xserver-xorg-video-radeon.manpages
b/debian/xserver-xorg-video-radeon.manpages
new file mode 100644
index 0000000..75a7c89
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man4/radeon.4
diff --git a/src/Makefile.in b/src/Makefile.in
index 64b6f69..14ec2b2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -433,7 +433,7 @@ EXTRA_DIST = \
radeon_atombios.h
pcidatadir = $(datadir)/xserver-xorg/pci
-pcidata_DATA = ati.ids
+pcidata_DATA = radeon.ids
all: all-am
.SUFFIXES:
@@ -1000,8 +1000,8 @@ uninstall-am: uninstall-ati_drv_laLTLIBRARIES
uninstall-pcidataDATA \
uninstall-theatre_drv_laLTLIBRARIES
-ati.ids: ati_pciids_gen.h
- awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed
-e 's/0x/1002/' > ati.ids
+radeon.ids: ati_pciids_gen.h
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed
-e 's/0x/1002/' > radeon.ids
# 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:
commit 316216d57b60d95ab7eb8683292c73ff4e969c00
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Jun 13 01:39:10 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index fd0bc89..0d7e840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-ati (1:6.8.191-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.8.191-1) unstable; urgency=low
* New upstream release candidate.
- -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 01:00:11 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 01:38:55 +0200
xserver-xorg-video-ati (1:6.8.1~git20080528.faea0088-1) experimental;
urgency=low
commit 2667e0a99b7bb7f7efec140732e1d95ac4f7147d
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri Jun 13 01:01:38 2008 +0200
New upstream release candidate
diff --git a/ChangeLog b/ChangeLog
index 86163e3..6bb9b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,132 @@
+commit 88ce87d79069662de28ecb3c10c140919927d584
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu Jun 12 15:10:47 2008 -0400
+
+ Bump for 6.9.0rc1 release
+
+commit ada41723fdc8cbeeda12bb4ae2d16e8d1ba215de
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed Jun 11 14:29:36 2008 -0400
+
+ R3xx: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
+
+ According to the hw guys, you should use DSTCACHE_CTLSTAT to
+ flush the 2D dst cache rather than RB2D_DSTCACHE_CTLSTAT.
+
+commit 3d70c398afa0831387af81559453b77c218a54f9
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Thu Jun 12 06:18:26 2008 +1000
+
+ atom: fix another endian define
+
+commit f1794e4c34d801371461afed37e7bb7d1fc79305
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Thu Jun 12 06:10:30 2008 +1000
+
+ atom: fixup includes in cd operations to get correct endian bits in
atombios.h
+
+commit f29976d12cc2020cd80c90fa3fd4b25c031559ba
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Wed Jun 11 19:33:02 2008 +1000
+
+ radeon: add lots of endian bits into the atombios parser
+
+commit 09eb220971b5d2bfd7d1ff6f552060967a133152
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Wed Jun 11 19:21:22 2008 +1000
+
+ atombios: fixup atombios bitfields for endianness
+
+ reverse the bits for big endian
+
+commit b80a3e85bf9dbfc8d96a745876d75d38bea97c1a
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Jun 9 20:29:47 2008 -0400
+
+ R5xx: fix RADEONSetAgpBase() for R5xx chips
+
+ Is there any reason to still do this in the ddx?
+ Maybe real old drms?
+
+commit ab7936708dfbee4d3676262f8010e001b73a4a38
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Mon Jun 9 17:05:04 2008 -0400
+
+ RS4xx: RC410 chips are actually RS400 based
+
+commit a54ca3c699c103e2e3df87101dca929a3eee4377
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Thu Jun 5 18:31:53 2008 +1000
+
+ radeon: fix typo in memory calcs
+
+ noticed by ghepeu on irc.
+
+commit 6e4e6d2a8f29f92efc219dca24ea31d1f37d5a0f
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Jun 3 20:32:20 2008 -0400
+
+ RADEON: minor cleanups
+
+commit 9d3afbf5fa4110928a9f965df2733c79db92ea99
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Tue Jun 3 11:40:49 2008 +0200
+
+ Call DRM_IOCTL_MODESET_CTL ioctl to avoid problems with DRM post
vblank-rework.
+
+commit effa245914823371e052cd9aa1143a02350891e7
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Jun 1 20:47:50 2008 -0400
+
+ ATOM: disable TV-out for now
+
+ It only sort of works in NTSC mode and isn't handled correctly
+ in all cases yet. Until we sort out the remaining details leave it
+ disabled.
+ See bugs: 16186, 16178, 16185
+
+commit 8504c6b0e40477ee544ad7f5366d569bdc53d6f0
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Fri May 30 11:19:03 2008 -0400
+
+ RADEON: update RADEONGetVRAMType() for newer chips
+
+commit 7cb695a329a9b543ad61af08c2d7d6eaf56de35e
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Fri May 30 10:10:56 2008 -0400
+
+ RADEON: add Int10 option
+
+ On some radeons you can't read the bios without initializing int10.
+ On ATOM-based secondary cards, intitializing int10 tends to hang the card.
+
+commit 714b2c63ec1c4a1410a6d521c03e9d1f90937c01
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Thu May 29 02:31:00 2008 -0400
+
+ RADEON: don't enable legacy bios table based init yet
+
+ Needs more work and we need to figure out how best to decide
+ when to use it.
+
+commit e20b08525a64888287ec4a369d8f7dbde95c655d
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed May 28 14:43:47 2008 -0400
+
+ ATOM: fail of we are not able to get a bios image
+
+commit d4fa17b426b0cafac3184b2ea9b675e2ff154ee9
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed May 28 09:50:02 2008 -0400
+
+ R1xx: Gamma fixes for overlay
+
+commit c7e6a50f60a04bbbf1c1ddbf4738a5f75c94f950
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed May 28 09:05:19 2008 -0400
+
+ RADEON: only attempt to read vbios from legacy ISA space if it's primary
+
commit faea008806802ec0e045754ec1eca492ebae320e
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Tue May 27 18:36:01 2008 -0400
diff --git a/configure b/configure
index b4ba6a5..6bb56e1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.8.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.8.191.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-ati'
PACKAGE_TARNAME='xf86-video-ati'
-PACKAGE_VERSION='6.8.0'
-PACKAGE_STRING='xf86-video-ati 6.8.0'
+PACKAGE_VERSION='6.8.191'
+PACKAGE_STRING='xf86-video-ati 6.8.191'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-ati 6.8.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-ati 6.8.191 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 6.8.0:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 6.8.191:";;
esac
cat <<\_ACEOF
@@ -1635,7 +1635,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-ati configure 6.8.0
+xf86-video-ati configure 6.8.191
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1649,7 +1649,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ati $as_me 6.8.0, which was
+It was created by xf86-video-ati $as_me 6.8.191, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2344,7 +2344,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-ati'
- VERSION='6.8.0'
+ VERSION='6.8.191'
cat >>confdefs.h <<_ACEOF
@@ -23323,7 +23323,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-ati $as_me 6.8.0, which was
+This file was extended by xf86-video-ati $as_me 6.8.191, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23376,7 +23376,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-ati config.status 6.8.0
+xf86-video-ati config.status 6.8.191
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 2fdf6a1..fd0bc89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.8.191-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 01:00:11 +0200
+
xserver-xorg-video-ati (1:6.8.1~git20080528.faea0088-1) experimental;
urgency=low
* New upstream snapshot, up to commit faea0088.
commit 88ce87d79069662de28ecb3c10c140919927d584
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Thu Jun 12 15:10:47 2008 -0400
Bump for 6.9.0rc1 release
diff --git a/configure.ac b/configure.ac
index a63f5e8..7418558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.8.0,
+ 6.8.191,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit ada41723fdc8cbeeda12bb4ae2d16e8d1ba215de
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Wed Jun 11 14:29:36 2008 -0400
R3xx: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
According to the hw guys, you should use DSTCACHE_CTLSTAT to
flush the 2D dst cache rather than RB2D_DSTCACHE_CTLSTAT.
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 4ce0da6..5897c7e 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -172,17 +172,17 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn)
(unsigned int)INREG(RADEON_RB3D_DSTCACHE_CTLSTAT));
}
} else {
- OUTREGP(R300_RB2D_DSTCACHE_CTLSTAT,
+ OUTREGP(R300_DSTCACHE_CTLSTAT,
R300_RB2D_DC_FLUSH_ALL,
~R300_RB2D_DC_FLUSH_ALL);
for (i = 0; i < RADEON_TIMEOUT; i++) {
- if (!(INREG(R300_RB2D_DSTCACHE_CTLSTAT) & R300_RB2D_DC_BUSY))
+ if (!(INREG(R300_DSTCACHE_CTLSTAT) & R300_RB2D_DC_BUSY))
break;
}
if (i == RADEON_TIMEOUT) {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"DC flush timeout: %x\n",
- (unsigned int)INREG(R300_RB2D_DSTCACHE_CTLSTAT));
+ (unsigned int)INREG(R300_DSTCACHE_CTLSTAT));
}
}
}
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index a9f2906..52795b1 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -4686,9 +4686,11 @@
#define R300_DST_PIPE_CONFIG 0x170c
# define R300_PIPE_AUTO_CONFIG (1 << 31)
#define R300_RB2D_DSTCACHE_MODE 0x3428
+#define R300_RB2D_DSTCACHE_MODE 0x3428
# define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
# define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
-#define R300_RB2D_DSTCACHE_CTLSTAT 0x342c
+#define R300_RB2D_DSTCACHE_CTLSTAT 0x342c /* use
DSTCACHE_CTLSTAT instead */
+#define R300_DSTCACHE_CTLSTAT 0x1714
# define R300_DC_FLUSH_2D (1 << 0)
# define R300_DC_FREE_2D (1 << 2)
# define R300_RB2D_DC_FLUSH_ALL (R300_DC_FLUSH_2D |
R300_DC_FREE_2D)
commit 3d70c398afa0831387af81559453b77c218a54f9
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Thu Jun 12 06:18:26 2008 +1000
atom: fix another endian define
diff --git a/src/AtomBios/Decoder.c b/src/AtomBios/Decoder.c
index cdaa9ef..e8b3b6e 100644
--- a/src/AtomBios/Decoder.c
+++ b/src/AtomBios/Decoder.c
@@ -34,7 +34,14 @@ Revision History:
NEG:24.09.2002 Initiated.
--*/
-//#include "AtomBios.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <X11/Xos.h>
+
+
#include "Decoder.h"
#include "atombios.h"
#include "CD_binding.h"
commit f1794e4c34d801371461afed37e7bb7d1fc79305
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Thu Jun 12 06:10:30 2008 +1000
atom: fixup includes in cd operations to get correct endian bits in
atombios.h
diff --git a/src/AtomBios/CD_Operations.c b/src/AtomBios/CD_Operations.c
index 1e48f81..509aa0c 100644
--- a/src/AtomBios/CD_Operations.c
+++ b/src/AtomBios/CD_Operations.c
@@ -36,10 +36,15 @@ Revision History:
--*/
#define __SW_4
-#include "Decoder.h"
-#include "atombios.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <X11/Xos.h>
+#include "xorg-server.h"
+#include "Decoder.h"
+#include "atombios.h"
VOID PutDataRegister(PARSER_TEMP_DATA STACK_BASED * pParserTempData);
VOID PutDataPS(PARSER_TEMP_DATA STACK_BASED * pParserTempData);
commit f29976d12cc2020cd80c90fa3fd4b25c031559ba
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Wed Jun 11 19:33:02 2008 +1000
radeon: add lots of endian bits into the atombios parser
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index e71b02e..e24697b 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -230,7 +230,7 @@ CailDebug(int scrnIndex, const char *format, ...)
static int
rhdAtomAnalyzeCommonHdr(ATOM_COMMON_TABLE_HEADER *hdr)
{
- if (hdr->usStructureSize == 0xaa55)
+ if (le16_to_cpu(hdr->usStructureSize) == 0xaa55)
return FALSE;
return TRUE;
@@ -246,24 +246,24 @@ rhdAtomAnalyzeRomHdr(unsigned char *rombase,
return FALSE;
}
xf86DrvMsg(-1,X_NONE,"\tSubsystemVendorID: 0x%4.4x SubsystemID: 0x%4.4x\n",
- hdr->usSubsystemVendorID,hdr->usSubsystemID);
- xf86DrvMsg(-1,X_NONE,"\tIOBaseAddress: 0x%4.4x\n",hdr->usIoBaseAddress);
- xf86DrvMsgVerb(-1,X_NONE,3,"\tFilename: %s\n",rombase +
hdr->usConfigFilenameOffset);
+
le16_to_cpu(hdr->usSubsystemVendorID),le16_to_cpu(hdr->usSubsystemID));
+ xf86DrvMsg(-1,X_NONE,"\tIOBaseAddress:
0x%4.4x\n",le16_to_cpu(hdr->usIoBaseAddress));
+ xf86DrvMsgVerb(-1,X_NONE,3,"\tFilename: %s\n",rombase +
le16_to_cpu(hdr->usConfigFilenameOffset));
xf86DrvMsgVerb(-1,X_NONE,3,"\tBIOS Bootup Message: %s\n",
- rombase + hdr->usBIOS_BootupMessageOffset);
+ rombase + le16_to_cpu(hdr->usBIOS_BootupMessageOffset));
- *data_offset = hdr->usMasterDataTableOffset;
- *command_offset = hdr->usMasterCommandTableOffset;
+ *data_offset = le16_to_cpu(hdr->usMasterDataTableOffset);
+ *command_offset = le16_to_cpu(hdr->usMasterCommandTableOffset);
return TRUE;
}
static int
-rhdAtomAnalyzeRomDataTable(unsigned char *base, int offset,
+rhdAtomAnalyzeRomDataTable(unsigned char *base, uint16_t offset,
void *ptr,unsigned short *size)
{
ATOM_COMMON_TABLE_HEADER *table = (ATOM_COMMON_TABLE_HEADER *)
- (base + offset);
+ (base + le16_to_cpu(offset));
if (!*size || !rhdAtomAnalyzeCommonHdr(table)) {
if (*size) *size -= 2;
@@ -286,7 +286,7 @@ rhdAtomGetTableRevisionAndSize(ATOM_COMMON_TABLE_HEADER
*hdr,
if (contentRev) *contentRev = hdr->ucTableContentRevision;
if (formatRev) *formatRev = hdr->ucTableFormatRevision;
- if (size) *size = (short)hdr->usStructureSize
+ if (size) *size = (short)le16_to_cpu(hdr->usStructureSize)
- sizeof(ATOM_COMMON_TABLE_HEADER);
return TRUE;
}
@@ -360,8 +360,8 @@ rhdAtomGetDataTable(int scrnIndex,
unsigned int BIOSImageSize)
{
unsigned int data_offset;
- unsigned int atom_romhdr_off = *(unsigned short*)
- (base + OFFSET_TO_POINTER_TO_ATOM_ROM_HEADER);
+ unsigned int atom_romhdr_off = le16_to_cpu(*(unsigned short*)
+ (base + OFFSET_TO_POINTER_TO_ATOM_ROM_HEADER));
ATOM_ROM_HEADER *atom_rom_hdr =
(ATOM_ROM_HEADER *)(base + atom_romhdr_off);
@@ -654,12 +654,12 @@ rhdAtomVramInfoQuery(atomBiosHandlePtr handle,
AtomBiosRequestID func,
switch (func) {
case GET_FW_FB_START:
- *val = atomDataPtr->VRAM_UsageByFirmware
- ->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware;
+ *val = le32_to_cpu(atomDataPtr->VRAM_UsageByFirmware
+
->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware);
break;
case GET_FW_FB_SIZE:
- *val = atomDataPtr->VRAM_UsageByFirmware
- ->asFirmwareVramReserveInfo[0].usFirmwareUseInKb;
+ *val = le16_to_cpu(atomDataPtr->VRAM_UsageByFirmware
+
->asFirmwareVramReserveInfo[0].usFirmwareUseInKb);
break;
default:
return ATOM_NOT_IMPLEMENTED;
@@ -686,7 +686,7 @@ rhdAtomTmdsInfoQuery(atomBiosHandlePtr handle,
switch (func) {
case ATOM_TMDS_FREQUENCY:
- *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].usFrequency;
+ *val =
le16_to_cpu(atomDataPtr->TMDS_Info->asMiscInfo[idx].usFrequency);
break;
case ATOM_TMDS_PLL_CHARGE_PUMP:
*val = atomDataPtr->TMDS_Info->asMiscInfo[idx].ucPLL_ChargePump;
@@ -721,20 +721,20 @@ rhdAtomDTDTimings(atomBiosHandlePtr handle,
ATOM_DTD_FORMAT *dtd)
if (!(mode = (DisplayModePtr)xcalloc(1,sizeof(DisplayModeRec))))
return NULL;
- mode->CrtcHDisplay = mode->HDisplay = dtd->usHActive;
- mode->CrtcVDisplay = mode->VDisplay = dtd->usVActive;
+ mode->CrtcHDisplay = mode->HDisplay = le16_to_cpu(dtd->usHActive);
+ mode->CrtcVDisplay = mode->VDisplay = le16_to_cpu(dtd->usVActive);
mode->CrtcHBlankStart = dtd->usHActive + dtd->ucHBorder;
- mode->CrtcHBlankEnd = mode->CrtcHBlankStart + dtd->usHBlanking_Time;
+ mode->CrtcHBlankEnd = mode->CrtcHBlankStart +
le16_to_cpu(dtd->usHBlanking_Time);
mode->CrtcHTotal = mode->HTotal = mode->CrtcHBlankEnd + dtd->ucHBorder;
mode->CrtcVBlankStart = dtd->usVActive + dtd->ucVBorder;
- mode->CrtcVBlankEnd = mode->CrtcVBlankStart + dtd->usVBlanking_Time;
+ mode->CrtcVBlankEnd = mode->CrtcVBlankStart +
le16_to_cpu(dtd->usVBlanking_Time);
mode->CrtcVTotal = mode->VTotal = mode->CrtcVBlankEnd + dtd->ucVBorder;
- mode->CrtcHSyncStart = mode->HSyncStart = dtd->usHActive +
dtd->usHSyncOffset;
- mode->CrtcHSyncEnd = mode->HSyncEnd = mode->HSyncStart + dtd->usHSyncWidth;
- mode->CrtcVSyncStart = mode->VSyncStart = dtd->usVActive +
dtd->usVSyncOffset;
- mode->CrtcVSyncEnd = mode->VSyncEnd = mode->VSyncStart + dtd->usVSyncWidth;
+ mode->CrtcHSyncStart = mode->HSyncStart = dtd->usHActive +
le16_to_cpu(dtd->usHSyncOffset);
+ mode->CrtcHSyncEnd = mode->HSyncEnd = mode->HSyncStart +
le16_to_cpu(dtd->usHSyncWidth);
+ mode->CrtcVSyncStart = mode->VSyncStart = dtd->usVActive +
le16_to_cpu(dtd->usVSyncOffset);
+ mode->CrtcVSyncEnd = mode->VSyncEnd = mode->VSyncStart +
le16_to_cpu(dtd->usVSyncWidth);
- mode->SynthClock = mode->Clock = dtd->usPixClk * 10;
+ mode->SynthClock = mode->Clock = le16_to_cpu(dtd->usPixClk) * 10;
mode->HSync = ((float) mode->Clock) / ((float)mode->HTotal);
mode->VRefresh = (1000.0 * ((float) mode->Clock))
@@ -966,15 +966,15 @@ rhdAtomLvdsGetTimings(atomBiosHandlePtr handle,
AtomBiosRequestID func,
case ATOMBIOS_GET_PANEL_EDID:
offset = (unsigned long)&atomDataPtr->LVDS_Info.base
- (unsigned long)handle->BIOSBase
- + atomDataPtr->LVDS_Info
- .LVDS_Info_v12->usExtInfoTableOffset;
+ + le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info_v12->usExtInfoTableOffset);
data->EDIDBlock
= rhdAtomLvdsDDC(handle, offset,
(unsigned char *)
&atomDataPtr->LVDS_Info.base
- + atomDataPtr->LVDS_Info
- .LVDS_Info_v12->usExtInfoTableOffset);
+ + le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info_v12->usExtInfoTableOffset));
if (data->EDIDBlock)
return ATOM_SUCCESS;
default:
@@ -1008,12 +1008,12 @@ rhdAtomLvdsInfoQuery(atomBiosHandlePtr handle,
case 1:
switch (func) {
case ATOM_LVDS_SUPPORTED_REFRESH_RATE:
- *val = atomDataPtr->LVDS_Info
- .LVDS_Info->usSupportedRefreshRate;
+ *val = le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info->usSupportedRefreshRate);
break;
case ATOM_LVDS_OFF_DELAY:
- *val = atomDataPtr->LVDS_Info
- .LVDS_Info->usOffDelayInMs;
+ *val = le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info->usOffDelayInMs);
break;
case ATOM_LVDS_SEQ_DIG_ONTO_DE:
*val = atomDataPtr->LVDS_Info
@@ -1050,12 +1050,12 @@ rhdAtomLvdsInfoQuery(atomBiosHandlePtr handle,
case 2:
switch (func) {
case ATOM_LVDS_SUPPORTED_REFRESH_RATE:
- *val = atomDataPtr->LVDS_Info
- .LVDS_Info_v12->usSupportedRefreshRate;
+ *val = le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info_v12->usSupportedRefreshRate);
break;
case ATOM_LVDS_OFF_DELAY:
- *val = atomDataPtr->LVDS_Info
- .LVDS_Info_v12->usOffDelayInMs;
+ *val = le16_to_cpu(atomDataPtr->LVDS_Info
+ .LVDS_Info_v12->usOffDelayInMs);
break;
case ATOM_LVDS_SEQ_DIG_ONTO_DE:
*val = atomDataPtr->LVDS_Info
@@ -1183,8 +1183,8 @@ rhdAtomGPIOI2CInfoQuery(atomBiosHandlePtr handle,
return ATOM_FAILED;
}
- *val = atomDataPtr->GPIO_I2C_Info->asGPIO_Info[*val]
- .usClkMaskRegisterIndex;
+ *val = le16_to_cpu(atomDataPtr->GPIO_I2C_Info->asGPIO_Info[*val]
+ .usClkMaskRegisterIndex);
break;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
