xserver-xorg-video-r128: Changes to 'debian-unstable'
ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 9 +++++++++
debian/control | 6 +++---
src/r128_output.c | 12 +++++-------
5 files changed, 56 insertions(+), 11 deletions(-)
New commits:
commit 2d930834fbd4b3d6cfdedd1a1225b56b1d15c152
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 19 23:33:42 2016 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index f0e448e..cdfd4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xserver-xorg-video-r128 (6.10.1-1) UNRELEASED; urgency=medium
+xserver-xorg-video-r128 (6.10.1-1) unstable; urgency=medium
+ * Team upload.
* New upstream release.
* Bump Standards-Version to 3.9.8.
* Update Vcs-* control fields.
- -- Julien Cristau <jcristau@debian.org> Thu, 19 May 2016 23:29:12 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 May 2016 23:33:34 +0200
xserver-xorg-video-r128 (6.10.0-1) unstable; urgency=medium
commit e55abcf52f5e945df850bf1f536f0c06c1781810
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 19 23:33:32 2016 +0200
Update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index de6c6b1..f0e448e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-r128 (6.10.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Standards-Version to 3.9.8.
+ * Update Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Thu, 19 May 2016 23:29:12 +0200
diff --git a/debian/control b/debian/control
index 5e19145..124d2b2 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
quilt,
xutils-dev
Standards-Version: 3.9.8
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128.git
Package: xserver-xorg-video-r128
Architecture: any
commit 06218f1b36cfa2fef40760e0820a34a36024022d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 19 23:29:58 2016 +0200
Bump Standards-Version to 3.9.8.
diff --git a/debian/changelog b/debian/changelog
index 379baea..de6c6b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-r128 (6.10.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Bump Standards-Version to 3.9.8.
-- Julien Cristau <jcristau@debian.org> Thu, 19 May 2016 23:29:12 +0200
diff --git a/debian/control b/debian/control
index 4123ee0..5e19145 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
xutils-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-r128
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git
commit 4e707386a67916d23976568f6776a166e7c21f13
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 19 23:29:38 2016 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index bb4c2b2..e38b0c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+commit d3f3c9549119629ddd9447a0f9b699a909b916d5
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Thu Jan 21 22:12:25 2016 -0500
+
+ Bump to version 6.10.1
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Christopher Chavez <chrischavez@gmx.us>
+
+commit 562681414f38c6925da01b3fec0802f532cd9e53
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Sun Jan 17 16:45:31 2016 -0500
+
+ Assume CRT in the absence of other monitors
+
+ This patch is still untested, but it sounds like a lot of people need
+ it. Assuming that there are no monitors when DDC fails (which causes X
+ to abort with UMS) does not make sense. Some people will always have DDC
+ fail. For example, the pins are not connected on an iMac G3. For another
+ example, some RAGE128TF cards are known to lie that there is no VGA port
+ in the connector table.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+
+commit d6dd6c9ad5ba8e4950c9398d93298fea48745263
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Thu Jul 2 18:20:58 2015 -0400
+
+ Really fix bitmasks for DDC
+
+ For DDC, there is actually no difference between Pro2 cards and other
+ VGA desktop cards. Mobility / dualhead cards are the only ones that
+ differ.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91113
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Kevin Brace <kevinbrace@gmx.com>
+
commit 0b0f74ac7db42c772c8dda0167154bbdcb904d4f
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri May 1 19:43:42 2015 -0400
diff --git a/debian/changelog b/debian/changelog
index 9dfd3c2..379baea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-r128 (6.10.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 May 2016 23:29:12 +0200
+
xserver-xorg-video-r128 (6.10.0-1) unstable; urgency=medium
* New upstream release.
commit d3f3c9549119629ddd9447a0f9b699a909b916d5
Author: Connor Behan <connor.behan@gmail.com>
Date: Thu Jan 21 22:12:25 2016 -0500
Bump to version 6.10.1
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Christopher Chavez <chrischavez@gmx.us>
diff --git a/configure.ac b/configure.ac
index 51bd90d..9aaa3ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-r128],
- [6.10.0],
+ [6.10.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-r128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 562681414f38c6925da01b3fec0802f532cd9e53
Author: Connor Behan <connor.behan@gmail.com>
Date: Sun Jan 17 16:45:31 2016 -0500
Assume CRT in the absence of other monitors
This patch is still untested, but it sounds like a lot of people need
it. Assuming that there are no monitors when DDC fails (which causes X
to abort with UMS) does not make sense. Some people will always have DDC
fail. For example, the pins are not connected on an iMac G3. For another
example, some RAGE128TF cards are known to lie that there is no VGA port
in the connector table.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
diff --git a/src/r128_output.c b/src/r128_output.c
index 75a70b4..a2c754b 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -234,7 +234,7 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
unsigned char *R128MMIO = info->MMIO;
R128OutputPrivatePtr r128_output = output->driver_private;
- R128MonitorType MonType = MT_NONE;
+ R128MonitorType MonType = MT_CRT;
xf86MonPtr *MonInfo = &output->MonInfo;
uint32_t mask1, mask2;
@@ -269,9 +269,6 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
else
MonType = MT_CRT;
}
- } else if (xf86I2CProbeAddress(r128_output->pI2CBus, 0x0060)) {
- /* Just in case. */
- MonType = MT_CRT;
}
return MonType;
commit d6dd6c9ad5ba8e4950c9398d93298fea48745263
Author: Connor Behan <connor.behan@gmail.com>
Date: Thu Jul 2 18:20:58 2015 -0400
Really fix bitmasks for DDC
For DDC, there is actually no difference between Pro2 cards and other
VGA desktop cards. Mobility / dualhead cards are the only ones that
differ.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91113
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Kevin Brace <kevinbrace@gmx.com>
diff --git a/src/r128_output.c b/src/r128_output.c
index 35aab72..75a70b4 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -230,6 +230,7 @@ static R128MonitorType R128DisplayDDCConnected(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
R128InfoPtr info = R128PTR(pScrn);
+ R128EntPtr pR128Ent = R128EntPriv(pScrn);
unsigned char *R128MMIO = info->MMIO;
R128OutputPrivatePtr r128_output = output->driver_private;
@@ -240,8 +241,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 | (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);
+ mask1 = R128_GPIO_MONID_MASK_1 | (pR128Ent->HasCRTC2 ? R128_GPIO_MONID_MASK_3 : R128_GPIO_MONID_MASK_2);
+ mask2 = R128_GPIO_MONID_A_1 | (pR128Ent->HasCRTC2 ? R128_GPIO_MONID_A_3 : R128_GPIO_MONID_A_2);
} else {
mask1 = R128_GPIO_MONID_MASK_0 | R128_GPIO_MONID_MASK_3;
mask2 = R128_GPIO_MONID_A_0 | R128_GPIO_MONID_A_3;
@@ -477,7 +478,7 @@ Bool R128SetupConnectors(ScrnInfoPtr pScrn)
if (otypes[i] != OUTPUT_LVDS && info->DDC) {
i2c.ddc_reg = R128_GPIO_MONID;
- if (otypes[i] == OUTPUT_VGA && info->isPro2) {
+ if (otypes[i] == OUTPUT_VGA && !pR128Ent->HasCRTC2) {
i2c.put_clk_mask = R128_GPIO_MONID_EN_2;
i2c.get_clk_mask = R128_GPIO_MONID_Y_2;
} else {
Reply to: