Attachment 25390 Details for Bug 21521 – updated patch

[patch] updated patch

bug21521.diff (text/plain), 2.03 KB, created by Alex Deucher on 2009-05-03 09:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-05-03 09:10:34 UTC

Size: 2.03 KB

patch

obsolete

>diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
>index 389b145..4ccb93b 100644
>--- a/src/radeon_atombios.c
>+++ b/src/radeon_atombios.c
>@@ -1594,19 +1594,6 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
> 	}
>     }
> 
>-    /* Acer board, gpios for DFPs are not off by one */
>-    if ((info->Chipset == PCI_CHIP_RS690_791E) &&
>-	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x105b) &&
>-	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0e0b)) {
>-	if (index == ATOM_DEVICE_DFP3_INDEX) {
>-	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_I;
>-	    info->BiosConnector[index].output_id = 0;
>-	    info->BiosConnector[index].ddc_i2c = RADEONLookupGPIOLineForDDC(pScrn, 0);
>-	}
>-	if (index == ATOM_DEVICE_DFP2_INDEX)
>-	    info->BiosConnector[index].ddc_i2c = RADEONLookupGPIOLineForDDC(pScrn, 1);
>-    }
>-
>     /* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */
>     if ((info->Chipset == PCI_CHIP_RS600_7941) &&
> 	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x147b) &&
>@@ -2313,12 +2300,14 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
> 	    info->BiosConnector[i].ddc_i2c.valid = FALSE;
> 	else if ((info->ChipFamily == CHIP_FAMILY_RS690) ||
> 		 (info->ChipFamily == CHIP_FAMILY_RS740)) {
>-	    /* IGP DFP ports use non-standard gpio entries */
>-	    if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) {
>+	    /* IGP DFP ports sometimes use non-standard gpio entries */
>+	    if ((i == ATOM_DEVICE_DFP2_INDEX) && (ci.sucI2cId.sbfAccess.bfI2C_LineMux == 2))
> 		info->BiosConnector[i].ddc_i2c =
> 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
>-		info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1;
>-	    } else
>+	    else if ((i == ATOM_DEVICE_DFP3_INDEX) && (ci.sucI2cId.sbfAccess.bfI2C_LineMux == 1))
>+		info->BiosConnector[i].ddc_i2c =
>+		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
>+	    else
> 		info->BiosConnector[i].ddc_i2c =
> 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
> 	} else

Actions: View | Splinter Review

Attachments on bug 21521: 25367 | 25374 | 25385 | 25386 | 25390 | 25393

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.