xf86-video-r128: Branch 'master'
Connor Behan
cbehan at kemper.freedesktop.org
Thu Jul 2 15:19:35 PDT 2015
src/r128_output.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit d6dd6c9ad5ba8e4950c9398d93298fea48745263
Author: Connor Behan <connor.behan at 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 at gmail.com>
Tested-by: Kevin Brace <kevinbrace at 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 {
More information about the xorg-commit
mailing list