xserver-xorg-video-r128: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/r128_output.c | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
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: