Attachment 64408 Details for Bug 52266 – possible fix

[patch] possible fix

0001-drm-radeon-fix-handling-for-ddc-type-5-on-combios.patch (text/plain), 3.19 KB, created by Alex Deucher on 2012-07-20 00:13:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2012-07-20 00:13:25 UTC

Size: 3.19 KB

patch

obsolete

>From 6902229f604b7992655c2f12c96d0aab6b341586 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Thu, 19 Jul 2012 20:11:44 -0400
>Subject: [PATCH] drm/radeon: fix handling for ddc type 5 on combios
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=52266
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_combios.c |   57 +++++++++++++++++++-----------
> 1 files changed, 36 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
>index 576f4f6..f75247d 100644
>--- a/drivers/gpu/drm/radeon/radeon_combios.c
>+++ b/drivers/gpu/drm/radeon/radeon_combios.c
>@@ -719,6 +719,34 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde
> 	return i2c;
> }
> 
>+static struct radeon_i2c_bus_rec radeon_combios_get_i2c_info_from_table(struct radeon_device *rdev)
>+{
>+	struct drm_device *dev = rdev->ddev;
>+	struct radeon_i2c_bus_rec i2c;
>+	u16 offset;
>+	u8 id, blocks, clk, data;
>+	int i;
>+
>+	i2c.valid = false;
>+
>+	offset = combios_get_table_offset(dev, COMBIOS_I2C_INFO_TABLE);
>+	if (offset) {
>+		blocks = RBIOS8(offset + 2);
>+		for (i = 0; i < blocks; i++) {
>+			id = RBIOS8(offset + 3 + (i * 5) + 0);
>+			if (id == 136) {
>+				clk = RBIOS8(offset + 3 + (i * 5) + 3);
>+				data = RBIOS8(offset + 3 + (i * 5) + 4);
>+				/* gpiopad */
>+				i2c = combios_setup_i2c_bus(rdev, DDC_MONID,
>+							    (1 << clk), (1 << data));
>+				break;
>+			}
>+		}
>+	}
>+	return i2c;
>+}
>+
> void radeon_combios_i2c_init(struct radeon_device *rdev)
> {
> 	struct drm_device *dev = rdev->ddev;
>@@ -755,30 +783,14 @@ void radeon_combios_i2c_init(struct radeon_device *rdev)
> 	} else if (rdev->family == CHIP_RS300 ||
> 		   rdev->family == CHIP_RS400 ||
> 		   rdev->family == CHIP_RS480) {
>-		u16 offset;
>-		u8 id, blocks, clk, data;
>-		int i;
>-
> 		/* 0x68 */
> 		i2c = combios_setup_i2c_bus(rdev, DDC_CRT2, 0, 0);
> 		rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID");
> 
>-		offset = combios_get_table_offset(dev, COMBIOS_I2C_INFO_TABLE);
>-		if (offset) {
>-			blocks = RBIOS8(offset + 2);
>-			for (i = 0; i < blocks; i++) {
>-				id = RBIOS8(offset + 3 + (i * 5) + 0);
>-				if (id == 136) {
>-					clk = RBIOS8(offset + 3 + (i * 5) + 3);
>-					data = RBIOS8(offset + 3 + (i * 5) + 4);
>-					/* gpiopad */
>-					i2c = combios_setup_i2c_bus(rdev, DDC_MONID,
>-								    (1 << clk), (1 << data));
>-					rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK");
>-					break;
>-				}
>-			}
>-		}
>+		/* gpiopad */
>+		i2c = radeon_combios_get_i2c_info_from_table(rdev);
>+		if (i2c.valid)
>+			rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK");
> 	} else if ((rdev->family == CHIP_R200) ||
> 		   (rdev->family >= CHIP_R300)) {
> 		/* 0x68 */
>@@ -2321,7 +2333,10 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
> 			connector = (tmp >> 12) & 0xf;
> 
> 			ddc_type = (tmp >> 8) & 0xf;
>-			ddc_i2c = combios_setup_i2c_bus(rdev, ddc_type, 0, 0);
>+			if (ddc_type == 5)
>+				ddc_i2c = radeon_combios_get_i2c_info_from_table(rdev);
>+			else
>+				ddc_i2c = combios_setup_i2c_bus(rdev, ddc_type, 0, 0);
> 
> 			switch (connector) {
> 			case CONNECTOR_PROPRIETARY_LEGACY:
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 52266: 64390 | 64391 | 64392 | 64395 | 64407 | 64408 | 64449

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.