Attachment 36556 Details for Bug 28671 – take 4

[patch] take 4

bug28671.diff (text/plain), 2.90 KB, created by Alex Deucher on 2010-06-27 22:49:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-06-27 22:49:34 UTC

Size: 2.90 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
>index 729e2f5..6164394 100644
>--- a/drivers/gpu/drm/radeon/radeon_combios.c
>+++ b/drivers/gpu/drm/radeon/radeon_combios.c
>@@ -1409,6 +1409,11 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
> 			/* PowerMac8,1 ? */
> 			/* imac g5 isight */
> 			rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT;
>+		} else if ((rdev->pdev->device == 0x4a48) &&
>+			   (rdev->pdev->subsystem_vendor == 0x1002) &&
>+			   (rdev->pdev->subsystem_device == 0x4a48)) {
>+			/* Mac X800 */
>+			rdev->mode_info.connector_table = CT_MAC_X800;
> 		} else
> #endif /* CONFIG_PPC_PMAC */
> #ifdef CONFIG_PPC64
>@@ -1885,6 +1890,48 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
> 					    CONNECTOR_OBJECT_ID_VGA,
> 					    &hpd);
> 		break;
>+	case CT_MAC_X800:
>+		DRM_INFO("Connector Table: %d (mac x800)\n",
>+			 rdev->mode_info.connector_table);
>+		/* DVI - primary dac, dvo */
>+		ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_DVI_DDC);
>+		hpd.hpd = RADEON_HPD_2; /* ??? */
>+		radeon_add_legacy_encoder(dev,
>+					  radeon_get_encoder_id(dev,
>+								ATOM_DEVICE_DFP2_SUPPORT,
>+								0),
>+					  ATOM_DEVICE_DFP2_SUPPORT);
>+		radeon_add_legacy_encoder(dev,
>+					  radeon_get_encoder_id(dev,
>+								ATOM_DEVICE_CRT1_SUPPORT,
>+								1),
>+					  ATOM_DEVICE_CRT1_SUPPORT);
>+		radeon_add_legacy_connector(dev, 0,
>+					    ATOM_DEVICE_DFP2_SUPPORT |
>+					    ATOM_DEVICE_CRT1_SUPPORT,
>+					    DRM_MODE_CONNECTOR_DVII, &ddc_i2c,
>+					    CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I,
>+					    &hpd);
>+		/* DVI - tv dac, internal tmds */
>+		ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_MONID);
>+		hpd.hpd = RADEON_HPD_1; /* ??? */
>+		radeon_add_legacy_encoder(dev,
>+					  radeon_get_encoder_id(dev,
>+								ATOM_DEVICE_DFP1_SUPPORT,
>+								0),
>+					  ATOM_DEVICE_DFP1_SUPPORT);
>+		radeon_add_legacy_encoder(dev,
>+					  radeon_get_encoder_id(dev,
>+								ATOM_DEVICE_CRT2_SUPPORT,
>+								2),
>+					  ATOM_DEVICE_CRT2_SUPPORT);
>+		radeon_add_legacy_connector(dev, 1,
>+					    ATOM_DEVICE_DFP1_SUPPORT |
>+					    ATOM_DEVICE_CRT2_SUPPORT,
>+					    DRM_MODE_CONNECTOR_DVII, &ddc_i2c,
>+					    CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I,
>+					    &hpd);
>+		break;
> 	default:
> 		DRM_INFO("Connector table: %d (invalid)\n",
> 			 rdev->mode_info.connector_table);
>diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
>index 95696aa..5a596f3 100644
>--- a/drivers/gpu/drm/radeon/radeon_mode.h
>+++ b/drivers/gpu/drm/radeon/radeon_mode.h
>@@ -196,7 +196,7 @@ struct radeon_i2c_chan {
> 
> /* mostly for macs, but really any system without connector tables */
> enum radeon_connector_table {
>-	CT_NONE,
>+	CT_NONE = 0,
> 	CT_GENERIC,
> 	CT_IBOOK,
> 	CT_POWERBOOK_EXTERNAL,
>@@ -207,6 +207,7 @@ enum radeon_connector_table {
> 	CT_IMAC_G5_ISIGHT,
> 	CT_EMAC,
> 	CT_RN50_POWER,
>+	CT_MAC_X800,
> };
> 
> enum radeon_dvo_chip {

Actions: View | Splinter Review

Attachments on bug 28671: 36419 | 36421 | 36423 | 36424 | 36428 | 36429 | 36499 | 36500 | 36526 | 36527 | 36554 | 36556 | 37285

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.