xserver-xorg-video-r128: Changes to 'debian-unstable'
ChangeLog | 443 +++++++
configure.ac | 12
debian/changelog | 8
debian/compat | 2
debian/control | 2
debian/rules | 5
debian/upstream/signing-key.asc | 30
debian/watch | 1
man/r128.man | 18
src/Makefile.am | 5
src/r128.h | 298 ++---
src/r128_accel.c | 46
src/r128_crtc.c | 408 +++++++
src/r128_cursor.c | 349 ++----
src/r128_dga.c | 408 -------
src/r128_dri.c | 27
src/r128_driver.c | 2290 +++++++++++-----------------------------
src/r128_exa_render.c | 25
src/r128_output.c | 503 ++++++++
src/r128_probe.c | 37
src/r128_probe.h | 117 +-
src/r128_reg.h | 16
src/r128_video.c | 165 +-
23 files changed, 2633 insertions(+), 2582 deletions(-)
New commits:
commit 274ab0a2a7ec917f0faab7ebeaba0460cd817cd5
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:42:03 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5b9aae1..9dfd3c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-r128 (6.10.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-r128 (6.10.0-1) unstable; urgency=medium
* New upstream release.
* Let uscan verify tarball signatures.
* Bump debhelper compat level to 9.
- -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:37:01 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:41:56 +0200
xserver-xorg-video-r128 (6.9.2-1) unstable; urgency=low
commit 08c9aa5664124198fdf0893f3b525f3abcd72265
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:38:23 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 2c2348e..5b9aae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
xserver-xorg-video-r128 (6.10.0-1) UNRELEASED; urgency=medium
- * Let uscan verify tarball signatures.
* New upstream release.
+ * Let uscan verify tarball signatures.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:37:01 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 80a3dae..4123ee0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.11.99.901),
diff --git a/debian/rules b/debian/rules
index 40dd7fc..5b29eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 56dc4464b277cee741a3fc94f9028ed60d9dd8c8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:37:15 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 59225ae..bb4c2b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,446 @@
+commit 0b0f74ac7db42c772c8dda0167154bbdcb904d4f
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Fri May 1 19:43:42 2015 -0400
+
+ Bump to version 6.10.0
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit d05022a1c398787d3f21d023a8251cb128ba9f9f
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 23 21:57:10 2015 -0400
+
+ Update bitmasks for DDC
+
+ A RAGE128TR chipset with a VGA port uses different i2c clock bits than
+ the VGA cards previously tested. It seems reasonable to assume that
+ other Pro2 cards are set up this way as well. In case this is incorrect,
+ a newly added xf86I2CProbeAddress() should still allow a monitor to be
+ detected.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
+
+commit b9c9779398828d4a1491e32f731aad6f79653976
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 23 21:51:45 2015 -0400
+
+ Look for VGA ports in the VBIOS
+
+ It appears that not all r128 chipsets marked as DFP capable have DVI
+ ports. Some have VGA which we should detect. The old driver "detected"
+ this by attempting a DVI based probe for monitors. Anything that failed
+ this was assumed to be VGA.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
+
+commit cd72de385b5600229226c3a7248a89569b452136
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 23 21:47:52 2015 -0400
+
+ Fix allocation of private entity
+
+ In the past, pR128Ent was only used for Xinerama-style dualhead and
+ therefore only allocated for cards with two outputs. However, recent
+ patches have repurposed pR128Ent as a general struct for things that are
+ card-specific instead of instance-specific. It therefore needs to be
+ allocated for all cards.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=89236
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
+
+commit 8c7daa148796a037ae2518154345719a735833c3
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Mar 4 00:31:33 2015 -0500
+
+ Restore PLL0 as well as PLL3
+
+ Apparently, the text mode driver can use either register to store the
+ pixel clock. The assumption made previously was apparently corrupting
+ the console on PowerPC systems. Thanks to Michael Lorenz for the patch.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=32606
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit bfff401440c5bb72fb1ce90c804f3a5623d733b0
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 2 16:15:16 2015 -0500
+
+ Make it easier to find EXA
+
+ As of commit e31564e1a21e73f4d20d6471da4fc7a9b63e4062, the xserver is
+ more picky about the order in which headers are included. We need to
+ account for this in order for the compile time exa.h check to succeed.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit e13dd1d338e4501c9d98c86c60806cc3d6801ea8
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 2 15:21:17 2015 -0500
+
+ Include dpmsconst header
+
+ Fixes the build on some systems. Thank-you to Andrew Randrianasulu for
+ the patch.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 86533afa3dd9a3567330f157d03cd8188f89cc72
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Mar 2 15:18:19 2015 -0500
+
+ Typo fix
+
+ This only affects XAA builds but still. Thank-you to Andrew
+ Randrianasulu for the patch.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit fcee44e469b22934a04bd3ee19ed101aaa176a54
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Sat Aug 23 01:24:42 2014 -0400
+
+ Silence the non-debug warnings
+
+ Some declarations of pScrn are only there for debugging purposes. This
+ should make gcc quieter on most systems.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 089c81ed6b6efc4610e0c5e5fcb36dfd58b83439
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Sat Aug 23 01:19:25 2014 -0400
+
+ Fix whitespace near panel code
+
+ This has been bugging me.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 0519b7b3aac61dfd57cbf3bb0da561ca9bd079cb
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Sat Aug 23 01:13:18 2014 -0400
+
+ Improve panel code
+
+ Since the driver uses PanelXRes and PanelYRes to calculate stretch
+ ratios, it should try harder to set them. For LVDS, we need to move the
+ xorg.conf check so that it executes before the BIOS check. For DVI, we
+ should read them from the mode that the X server has identified as being
+ the native one. Even then, PanelXRes and PanelYRes are not guaranteed to
+ be positive, so the driver should verify this before dividing by them.
+
+ Another problem with the old panel code was that PanelPwrDly had no sane
+ default. It was also missing the check for Rage Pro 2 which lacks RMX.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit d49c3431e92a6120b054959ce6910e8decf61c67
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Fri Jul 25 13:39:08 2014 -0700
+
+ Remove custom DGA code
+
+ I have yet to see a use for the DGA code included in the driver.
+ According to radeon commits, it should be safe to replace it with DiDGA.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 6140081f0e8f41cf85b8e86f7a9474c20be9a2e9
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Aug 6 15:51:33 2014 -0700
+
+ Remove custom dualhead code
+
+ There are probably no reasons left to use Xinerama over xrandr. This
+ removes the screen based dualhead code and the BIOS Display option in
+ xorg.conf. Additionally, R128ValidMode() is wrapped so that it can be
+ aware of multiple displays.
+
+ Even though some Crtc functions refer to them, PanelXRes and PanelYRes
+ should be properties of the Output. If this change to the code seems
+ awkward, see http://marc.info/?t=107222330700001 for more information.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 2072d9aa1a144e699f020a7f9e6a870e410bc9d7
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Aug 6 15:41:02 2014 -0700
+
+ Improve handling of monitor and output types
+
+ Checking for OUTPUT_DVI is not the same as checking for MT_DFP. There
+ might be r128 cards with a DVI-I connector. These have the capability of
+ driving an MT_CRT so we now check the monitor type before programming
+ DAC or TMDS registers.
+
+ This patch also removes R128ConnectorType and R128BIOSConnector because
+ they were not doing much. These data structures are more useful for the
+ radeon driver where there is a much wider range of cards.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 6dc5e9ab12dc31ae5de24f1d5c10c4fe80e7fe07
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Thu Jul 24 00:01:46 2014 -0700
+
+ Unify byte swappers
+
+ The cursor loading function was using a lot of code to swap bytes for
+ big endian systems. For awhile now, the solid picture support for EXA
+ has had a more optimized function that does the same thing.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 48e9b2359e8ab07095e1cb024e61b223a67cbc1a
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Thu Jul 24 00:00:24 2014 -0700
+
+ Unify allocators
+
+ RandR and Xv were using almost the same code to grab offscreen memory
+ from EXA and XAA.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 0d901460b375599c727928634d5f1067d2279844
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 17:47:44 2014 -0700
+
+ Use standard integers
+
+ To fix another warning, we need to be consistent about when we use
+ CARD32 an when we use uint32_t. Xorg developers have decided on the
+ latter as a convention.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit b632e89b923179b16d0d38128209427f666b963c
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 02:20:18 2014 -0700
+
+ Remove pointless output
+
+ This removes a debug line to fix a compiler warning and make the
+ crtc1 and crtc2 code more symmetric. The number of bits per pixel is
+ easy to find out anyway.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 866d0ad5295a7ca819b990f607d3e68582144b3b
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 17:39:59 2014 -0700
+
+ Cleanup info struct
+
+ This removes some dead code from info. It also fixes some indentation
+ errors that were likely caused by sed.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit d05123eab19705d23310d06a299e61093abbe6cc
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 17:23:37 2014 -0700
+
+ Cleanup entity struct
+
+ This moves HasCRTC2 into the entity to make it more similar to radeon.
+ It also removes IsDRIEnabled for being dead code.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit c95ce4251921f09101911ca5c4ff3940c38cc6b5
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 01:29:19 2014 -0700
+
+ Get entity without code duplication
+
+ This fixes the parts of the code that were not using the helper function
+ to find the entity.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit e9ea36390ea0478c4b867df3bffdf2b122e0cb15
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 16 00:57:18 2014 -0700
+
+ Change register name
+
+ Surely this is a typo.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 3bbce42414abea6c9977ff2b023ce3210d78f008
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 9 11:40:35 2014 -0700
+
+ Move display enabling code to DPMS
+
+ This ensures that DAC, TMDS and LVDS enable bits are properly saved and
+ only set in the dpms hook.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit de7fa61b06c887df7a89154bf0f07703a665263a
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 9 11:37:12 2014 -0700
+
+ Split up output register functions
+
+ The old code was writing registers more often than it needed to. TMDS
+ writes were triggered by changing the mode for an LVDS panel and RMX
+ writes were triggered by changing the mode for the second crtc. This
+ splits TMDS, LVDS, DAC and RMX calls into their own functions.
+
+ Also note that routing bits have been specified. R128_FP_SEL_CRTC2 and
+ R128_LVDS_SEL_CRTC2 are always unset to make the panels use the first
+ crtc. R128_DAC_CRT_SEL_CRTC2 is unset unless LVDS is already using the
+ first crtc.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 4c6457e1893e16546c03ca85a2fa7378b6c927f3
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Jul 7 18:49:15 2014 -0700
+
+ Map and unmap the MMIO better
+
+ Now that the MMIO stays mapped during several function calls, we need to
+ remember to unmap it if any of them fail. This also fixes a PowerPC code
+ path that was not updated to work with the longer lived MMIO.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 539320429ff1cf8918862da3f950c8740ba63ec4
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Fri Jul 4 12:44:30 2014 -0700
+
+ Only enable CRTCs for DPMSModeOn
+
+ This was suggested as a power saving tip.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 3ed5035074540785f820906529fcce3148e0b387
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Jul 2 02:18:48 2014 -0700
+
+ Port to RandR
+
+ This rearranges the r128 code to use the Crtc and Output interfaces
+ which should make the driver easier to maintain in the long run. User
+ visible changes include DDC detection working in more cases and the
+ ability to have multiple monitors with DRI.
+
+ Some choices have been made to conserve memory. Modes can be switched up
+ to the highest resolution in xorg.conf. If this is 1024x768 for example,
+ the front buffer will be 1024x768 instead of 1024x1024. This means 90
+ and 270 degree rotations will not work. However, scalings, reflection
+ and 180 degree rotations can be set with the xrandr client program.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=75629
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 4efc87f41d770c753ddf7f54fe334b6dbd7daf79
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Mon Apr 28 21:26:44 2014 -0700
+
+ Fix ScreenInit with noAccel
+
+ Now that EXA is on by default, we must remember to turn it off again if
+ acceleration is disabled.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit 5ef5812a7a272aa08543cfd9b633f33c35e34dbd
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Tue Mar 4 01:43:00 2014 -0800
+
+ Remove overuse of COMPOSITE_SETUP()
+
+ COMPOSITE_SETUP() involves expensive register writes so
+ R128EnterServer() should call it once when there are 3D windows and 0
+ times when there are no 3D windows.
+
+ Instead the code was calling it once when there were no 3D windows and
+ arbitrarily many times when there were 3D windows.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 9eb693640136bc8bcbe706d642519b4eb23286d4
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Nov 27 18:14:43 2013 -0800
+
+ Only declare PCITAG if we need it
+
+ If libpciaccess is available, we do not need to declare the deprecated
+ PciTag member because it will not be used.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 35dc7faf9f87332f51ff0a6aa866a56eb017a950
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Thu Nov 21 22:09:57 2013 -0800
+
+ Do not disable gouraud shading for a render op
+
+ The EXA Composite hooks should not overwrite any register values
+ expected by DRI. Initial testing of the EXA support revealed that
+ R128_WINDOW_XY_OFFSET is one register where we have to be careful.
+ However, it was mostly tested using glxgears which does not stress the
+ driver very much. Going through the various 3D screensavers one by one
+ reveals a bug where certain models turn green if compositing is enabled.
+
+ It seems that if we slightly alter the values passed to R128_SETUP_CNTL
+ and R128_PM4_VC_FPU_SETUP, the 3D driver will be happy and compositing
+ will still work. The proper way would be to constantly save and restore
+ register values but this showed poor performance when dragging 3D
+ windows across the screen.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit d757fe10b9ce9493ef3cf854bc03088366aa7256
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Fri Nov 22 22:55:59 2013 -0800
+
+ Drop dependence on xf86PciInfo.h
+
+ It is about time we stop using this deprecated file and include pciids
+ locally.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit d5da29d2ff94c80c8edefd6ccf5fd05fc6018870
+Author: Tormod Volden <debian.tormod@gmail.com>
+Date: Fri Oct 25 20:31:05 2013 +0200
+
+ Do not use int10 or VBE on powerpc
+
+ VBE was already skipped in the normal path, but not when setting
+ the PROBE_DETECT flag.
+
+ Should avoid bus error seen in
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622606 and
+ http://lists.x.org/archives/xorg/2012-February/053969.html
+
+ Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
commit ccdfcf5c05ccade823c9734212dcb865d8958cbb
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Wed Oct 2 20:36:38 2013 +0200
diff --git a/debian/changelog b/debian/changelog
index 5a4d22b..2c2348e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-r128 (6.9.2-2) UNRELEASED; urgency=medium
+xserver-xorg-video-r128 (6.10.0-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
+ * New upstream release.
- -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:35:30 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:37:01 +0200
xserver-xorg-video-r128 (6.9.2-1) unstable; urgency=low
commit c0bcce87b542ace26dc9ced573862b24d80cbe8d
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 11:35:58 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 7b58909..5a4d22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-r128 (6.9.2-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 May 2015 11:35:30 +0200
+
xserver-xorg-video-r128 (6.9.2-1) unstable; urgency=low
[ Tormod Volden ]
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..5a38cbd
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBE9lJLABCACcfcxudfiviXnfYbZmSLONoJ4n/FbIw2mKHmxrLc+uIiGw3FOp
+c20NU4OzS4s+QtoE49fXL7ubjliquUWybbMShhXG+X5NXnWck5TRZtzGEVXTzn3+
+TZQVPtO0XG7bmpWuNEfFtVafv/K3gD3WQbg9350yd9faqNxVhwFkU2LqJcHLRpc6
+D5zbCVZjBxKzpVRjICjwlSN7V4qQER9wnKWuVs1K7cveHb9x17VZAXik5WYM9b3F
+8E+BBvMYJtZBK/yoJzJ+farYQR40Uij1xulGcGq3J9GQPa4OiOD3ke254TDSAntt
+iaGkw/tigiMCYLMTp7GQkhIyoLjzMFDNnDYHABEBAAG0JUNvbm5vciBCZWhhbiA8
+Y29ubm9yLmJlaGFuQGdtYWlsLmNvbT6JATgEEwECACIFAk9lJLACGwMGCwkIBwMC
+BhUIAgkKCwQWAgMBAh4BAheAAAoJENU6BEW0eg2rdQQIAI34yXLuI73N44XnZRZk
+cbYlDKWv4pmQEZxs6T4AUc6E0nSMVddleTWRWcbuzF/FojZ81DN9GoVVpePrg/rP
+CCDrgaqWvwyBnIeJZIPIHKd3oKo9DTiNTrfpJb8eqgAypMiOn9wHcBwuvLQc2zE6
+enhsAYJZSBBy5r8dKVtUreWHwnislRK2BCq6pnaJoHUfODttmhwPPIiCAFcQVJjk
++0Ds43YJHkb/FoYv1E9fw8qGPjbLrO1Us+P1A4XYcWyQ0TAFd4ec6YmVG84KzeNv
+ZZivPkcuXyGQqVuIPf642RnLvWLqj3uivnjwRoouET58ZKTA9sHT61iLnIlBHNuS
+mCS5AQ0ET2UksAEIAPF9d1dJ7PoKvUyJasYG0FCY7v4UbAcjcyGpK+VZqGvQW02Q
+vJGO/WyQbF/oNqKrxeqR8ClI3yK4anSAYrEKo2ObtvsklySzi/G/B75T6pB9PlR+
+jwrjZRa/qwWIQkpgLM8GWqNU1BXdfkNsbslyOL0jznCWsC1kricBHjg+UjC1OAzG
+cP0nHa4G3nQihNWEbJYXAqsjJh0edh18W34fiSIQlMPPhZTk+mvgzcXsRP2KQJl5
+lpN62AEzUB6GPOS19dTpm1zeAtQWHzqgWlhOVW/cG7iQpUGTgkBeroA7hWpjh9LF
+qQf2MD1jqflMdWnr5fmpwfADgrtvPq45MpvgPNcAEQEAAYkBHwQYAQIACQUCT2Uk
+sAIbDAAKCRDVOgRFtHoNq/jxB/9ggUp84SBAl1r8kPwAnvbGrqrVOHCxBGMxh81U
+h4ttzSjRtTHFdlri+CPf6tSAl2Ju30rOKSfyGR8yN8b6kticESwRvNnTAgu2vgDN
+2ARYaYDlaDH7RaCg+OncHHi4u1XKXjsPMAUI7Md41d/V+Sx54J4UNt5kTJwcuC7x
+6N/WsbRhScSjLzKU0qvxS+A6aWYLBskrlz3lPlrDINMuWkjAeNo3m6bRVoITYUDg
+EIuiQm8CI2/p5+y9vVrkd7Eyi6CAToTmq21OKO3Tm/kWbLMoeyAY8sTMYlgfzQCZ
+e2nHiX/WhDHGYJaE5v2GRdGZUG9JirUNUVpYDwDYv2EtNjqV
+=5uyB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 7f743d7..6070bfd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-r128
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-r128-(.*)\.tar\.gz
commit 0b0f74ac7db42c772c8dda0167154bbdcb904d4f
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri May 1 19:43:42 2015 -0400
Bump to version 6.10.0
Signed-off-by: Connor Behan <connor.behan@gmail.com>
diff --git a/configure.ac b/configure.ac
index 7b461c6..51bd90d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-r128],
- [6.9.2],
+ [6.10.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-r128])
AC_CONFIG_SRCDIR([Makefile.am])
commit d05022a1c398787d3f21d023a8251cb128ba9f9f
Author: Connor Behan <connor.behan@gmail.com>
Date: Mon Mar 23 21:57:10 2015 -0400
Update bitmasks for DDC
A RAGE128TR chipset with a VGA port uses different i2c clock bits than
the VGA cards previously tested. It seems reasonable to assume that
other Pro2 cards are set up this way as well. In case this is incorrect,
a newly added xf86I2CProbeAddress() should still allow a monitor to be
detected.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
diff --git a/src/r128_output.c b/src/r128_output.c
index 7de4c4a..35aab72 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -240,8 +240,8 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
if (r128_output->type == OUTPUT_LVDS) {
return MT_LCD;
} else if (r128_output->type == OUTPUT_VGA) {
- mask1 = R128_GPIO_MONID_MASK_1 | R128_GPIO_MONID_MASK_3;
- mask2 = R128_GPIO_MONID_A_1 | R128_GPIO_MONID_A_3;
+ mask1 = R128_GPIO_MONID_MASK_1 | (info->isPro2 ? R128_GPIO_MONID_MASK_2 : R128_GPIO_MONID_MASK_3);
+ mask2 = R128_GPIO_MONID_A_1 | (info->isPro2 ? R128_GPIO_MONID_A_2 : R128_GPIO_MONID_A_3);
} else {
mask1 = R128_GPIO_MONID_MASK_0 | R128_GPIO_MONID_MASK_3;
mask2 = R128_GPIO_MONID_A_0 | R128_GPIO_MONID_A_3;
@@ -268,6 +268,9 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
else
MonType = MT_CRT;
}
+ } else if (xf86I2CProbeAddress(r128_output->pI2CBus, 0x0060)) {
+ /* Just in case. */
+ MonType = MT_CRT;
}
return MonType;
@@ -474,8 +477,13 @@ Bool R128SetupConnectors(ScrnInfoPtr pScrn)
if (otypes[i] != OUTPUT_LVDS && info->DDC) {
i2c.ddc_reg = R128_GPIO_MONID;
- i2c.put_clk_mask = R128_GPIO_MONID_EN_3;
- i2c.get_clk_mask = R128_GPIO_MONID_Y_3;
+ if (otypes[i] == OUTPUT_VGA && info->isPro2) {
+ i2c.put_clk_mask = R128_GPIO_MONID_EN_2;
+ i2c.get_clk_mask = R128_GPIO_MONID_Y_2;
+ } else {
+ i2c.put_clk_mask = R128_GPIO_MONID_EN_3;
+ i2c.get_clk_mask = R128_GPIO_MONID_Y_3;
+ }
if (otypes[i] == OUTPUT_VGA) {
i2c.put_data_mask = R128_GPIO_MONID_EN_1;
i2c.get_data_mask = R128_GPIO_MONID_Y_1;
commit b9c9779398828d4a1491e32f731aad6f79653976
Author: Connor Behan <connor.behan@gmail.com>
Date: Mon Mar 23 21:51:45 2015 -0400
Look for VGA ports in the VBIOS
It appears that not all r128 chipsets marked as DFP capable have DVI
ports. Some have VGA which we should detect. The old driver "detected"
this by attempting a DVI based probe for monitors. Anything that failed
this was assumed to be VGA.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
diff --git a/src/r128_output.c b/src/r128_output.c
index 0160880..7de4c4a 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -390,9 +390,11 @@ void R128SetupGenericConnectors(ScrnInfoPtr pScrn, R128OutputType *otypes)
if (!pR128Ent->HasCRTC2 && !info->isDFP) {
otypes[0] = OUTPUT_VGA;
+ otypes[1] = OUTPUT_NONE;
return;
} else if (!pR128Ent->HasCRTC2) {
otypes[0] = OUTPUT_DVI;
+ otypes[1] = OUTPUT_NONE;
return;
}
@@ -400,6 +402,24 @@ void R128SetupGenericConnectors(ScrnInfoPtr pScrn, R128OutputType *otypes)
otypes[1] = OUTPUT_VGA;
}
+void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes)
+{
+ R128InfoPtr info = R128PTR(pScrn);
+ uint16_t bios_header;
+ int offset;
+
+ /* XXX: Currently, this function only finds VGA ports misidentified as DVI. */
+ if (!info->VBIOS || otypes[0] != OUTPUT_DVI) return;
+
+ bios_header = R128_BIOS16(0x48);
+ offset = R128_BIOS16(bios_header + 0x60);
+
+ if (offset) {
+ otypes[0] = OUTPUT_VGA;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Found CRT table, assuming VGA connector\n");
+ }
+}
+
Bool R128SetupConnectors(ScrnInfoPtr pScrn)
{
R128InfoPtr info = R128PTR(pScrn);
@@ -411,8 +431,8 @@ Bool R128SetupConnectors(ScrnInfoPtr pScrn)
int num_dvi = 0;
int i;
- /* XXX: Can we make R128GetConnectorInfoFromBIOS()? */
R128SetupGenericConnectors(pScrn, otypes);
+ R128GetConnectorInfoFromBIOS(pScrn, otypes);
for (i = 0; i < R128_MAX_BIOS_CONNECTOR; i++) {
if (otypes[i] == OUTPUT_VGA)
commit cd72de385b5600229226c3a7248a89569b452136
Author: Connor Behan <connor.behan@gmail.com>
Date: Mon Mar 23 21:47:52 2015 -0400
Fix allocation of private entity
In the past, pR128Ent was only used for Xinerama-style dualhead and
therefore only allocated for cards with two outputs. However, recent
patches have repurposed pR128Ent as a general struct for things that are
card-specific instead of instance-specific. It therefore needs to be
allocated for all cards.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=89236
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
diff --git a/src/r128_probe.c b/src/r128_probe.c
index 9771d52..363904e 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -234,6 +234,7 @@ r128_get_scrninfo(int entity_num)
{
ScrnInfoPtr pScrn = NULL;
EntityInfoPtr pEnt;
+ DevUnion* pPriv;
pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, R128PciChipsets,
NULL,
@@ -261,6 +262,20 @@ r128_get_scrninfo(int entity_num)
pEnt = xf86GetEntityInfo(entity_num);
+ /* Allocate private entity used for convenience with one or two heads. */
+ if (gR128EntityIndex < 0) {
+ gR128EntityIndex = xf86AllocateEntityPrivateIndex();
+ pPriv = xf86GetEntityPrivate(pScrn->entityList[0], gR128EntityIndex);
+
+ if (!pPriv->ptr) {
+ R128EntPtr pR128Ent;
+ pPriv->ptr = xnfcalloc(sizeof(R128EntRec), 1);
+ pR128Ent = pPriv->ptr;
+ pR128Ent->HasSecondary = FALSE;
+ pR128Ent->IsSecondaryRestored = FALSE;
+ }
+ }
+
/* mobility cards support Dual-Head, mark the entity as sharable*/
if (pEnt->chipset == PCI_CHIP_RAGE128LE ||
pEnt->chipset == PCI_CHIP_RAGE128LF ||
@@ -268,7 +283,6 @@ r128_get_scrninfo(int entity_num)
pEnt->chipset == PCI_CHIP_RAGE128ML)
{
static int instance = 0;
- DevUnion* pPriv;
xf86SetEntitySharable(entity_num);
@@ -276,22 +290,6 @@ r128_get_scrninfo(int entity_num)
pScrn->entityList[0],
instance);
- if (gR128EntityIndex < 0)
- {
- gR128EntityIndex = xf86AllocateEntityPrivateIndex();
-
- pPriv = xf86GetEntityPrivate(pScrn->entityList[0],
- gR128EntityIndex);
-
- if (!pPriv->ptr)
- {
- R128EntPtr pR128Ent;
- pPriv->ptr = xnfcalloc(sizeof(R128EntRec), 1);
- pR128Ent = pPriv->ptr;
- pR128Ent->HasSecondary = FALSE;
- pR128Ent->IsSecondaryRestored = FALSE;
- }
- }
instance++;
}
commit 8c7daa148796a037ae2518154345719a735833c3
Author: Connor Behan <connor.behan@gmail.com>
Date: Wed Mar 4 00:31:33 2015 -0500
Restore PLL0 as well as PLL3
Apparently, the text mode driver can use either register to store the
pixel clock. The assumption made previously was apparently corrupting
the console on PowerPC systems. Thanks to Michael Lorenz for the patch.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=32606
Signed-off-by: Connor Behan <connor.behan@gmail.com>
diff --git a/src/r128.h b/src/r128.h
index 19124bf..e3253a5 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -225,6 +225,7 @@ typedef struct {
/* PLL registers */
uint32_t ppll_ref_div;
uint32_t ppll_div_3;
+ uint32_t ppll_div_0;
uint32_t htotal_cntl;
/* Computed values for PLL2 */
diff --git a/src/r128_driver.c b/src/r128_driver.c
index e4e43a6..9a676d5 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2332,6 +2332,15 @@ void R128RestorePLLRegisters(ScrnInfoPtr pScrn, R128SavePtr restore)
R128PLLWriteUpdate(pScrn);
R128PLLWaitForReadUpdateComplete(pScrn);
+ OUTPLLP(pScrn, R128_PPLL_DIV_0,
+ restore->ppll_div_0, ~R128_PPLL_FB0_DIV_MASK);
+/* R128PLLWriteUpdate(pScrn);*/
+ OUTPLLP(pScrn, R128_PPLL_DIV_0,
+ restore->ppll_div_0, ~R128_PPLL_POST0_DIV_MASK);
+
+ R128PLLWriteUpdate(pScrn);
+ R128PLLWaitForReadUpdateComplete(pScrn);
+
OUTPLL(R128_HTOTAL_CNTL, restore->htotal_cntl);
/* R128PLLWriteUpdate(pScrn);*/
@@ -2527,6 +2536,7 @@ static void R128SavePLLRegisters(ScrnInfoPtr pScrn, R128SavePtr save)
{
save->ppll_ref_div = INPLL(pScrn, R128_PPLL_REF_DIV);
save->ppll_div_3 = INPLL(pScrn, R128_PPLL_DIV_3);
+ save->ppll_div_0 = INPLL(pScrn, R128_PPLL_DIV_0);
save->htotal_cntl = INPLL(pScrn, R128_HTOTAL_CNTL);
R128TRACE(("Read: 0x%08x 0x%08x 0x%08x\n",
diff --git a/src/r128_reg.h b/src/r128_reg.h
index eee5fb1..b147e00 100644
--- a/src/r128_reg.h
+++ b/src/r128_reg.h
@@ -905,6 +905,8 @@
# define R128_PPLL_ATOMIC_UPDATE_EN (1 << 16)
# define R128_PPLL_VGA_ATOMIC_UPDATE_EN (1 << 17)
#define R128_PPLL_DIV_0 0x0004 /* PLL */
+# define R128_PPLL_FB0_DIV_MASK 0x07ff
+# define R128_PPLL_POST0_DIV_MASK 0x00070000
#define R128_PPLL_DIV_1 0x0005 /* PLL */
#define R128_PPLL_DIV_2 0x0006 /* PLL */
#define R128_PPLL_DIV_3 0x0007 /* PLL */
commit bfff401440c5bb72fb1ce90c804f3a5623d733b0
Author: Connor Behan <connor.behan@gmail.com>
Date: Mon Mar 2 16:15:16 2015 -0500
Make it easier to find EXA
As of commit e31564e1a21e73f4d20d6471da4fc7a9b63e4062, the xserver is
more picky about the order in which headers are included. We need to
account for this in order for the compile time exa.h check to succeed.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
diff --git a/configure.ac b/configure.ac
index 3cc3113..7b461c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,12 +121,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
AC_MSG_CHECKING([whether to enable EXA support])
if test "x$EXA" = xyes; then
AC_MSG_RESULT(yes)
-
- SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
- AC_CHECK_HEADER(exa.h,
- [have_exa_h="yes"], [have_exa_h="no"])
- CPPFLAGS="$SAVE_CPPFLAGS"
+ AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"])
else
AC_MSG_RESULT(no)
fi
@@ -136,6 +131,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
if test "x$have_exa_h" = xyes; then
AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
#include "exa.h"
#if EXA_VERSION_MAJOR < 2
#error OLD EXA!
commit e13dd1d338e4501c9d98c86c60806cc3d6801ea8
Author: Connor Behan <connor.behan@gmail.com>
Date: Mon Mar 2 15:21:17 2015 -0500
Include dpmsconst header
Fixes the build on some systems. Thank-you to Andrew Randrianasulu for
the patch.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 26d4414..d62cc6a 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -35,6 +35,7 @@
#include "xf86.h"
#include "xf86Modes.h"
+#include "X11/extensions/dpmsconst.h"
#include "r128.h"
Reply to: