Attachment 31845 Details for Bug 24263 – fix

[patch] fix

0001-drm-radeon-kms-connector-fixes.patch (text/plain), 3.64 KB, created by Alex Deucher on 2009-12-08 09:54:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-08 09:54:20 UTC

Size: 3.64 KB

patch

obsolete

>From 9065a7b4454aa88a797122b4a082d1b69e067821 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Tue, 8 Dec 2009 12:48:20 -0500
>Subject: [PATCH] drm/radeon/kms: connector fixes
>
>- Don't add dac load detection property to DVI-D
>- Make sure i2c info is valid before adding DP aux chan bus
>- Don't create scaling_mode_property twice
>- fix typo that prevented coherent and load detection from working
>- add coherent prop to DP (for dp->dvi adapters)
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/radeon_connectors.c |   20 +++++++++++++-------
> drivers/gpu/drm/radeon/radeon_display.c    |    4 ++--
> 2 files changed, 15 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index 079a24b..f264ae9 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -1120,10 +1120,12 @@ radeon_add_atom_connector(struct drm_device *dev,
> 		drm_connector_attach_property(&radeon_connector->base,
> 					      rdev->mode_info.coherent_mode_property,
> 					      1);
>-		radeon_connector->dac_load_detect = true;
>-		drm_connector_attach_property(&radeon_connector->base,
>-					      rdev->mode_info.load_detect_property,
>-					      1);
>+		if (connector_type == DRM_MODE_CONNECTOR_DVII) {
>+			radeon_connector->dac_load_detect = true;
>+			drm_connector_attach_property(&radeon_connector->base,
>+						      rdev->mode_info.load_detect_property,
>+						      1);
>+		}
> 		break;
> 	case DRM_MODE_CONNECTOR_HDMIA:
> 	case DRM_MODE_CONNECTOR_HDMIB:
>@@ -1158,14 +1160,19 @@ radeon_add_atom_connector(struct drm_device *dev,
> 		ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
> 		if (ret)
> 			goto failed;
>-		/* add DP i2c bus */
>-		radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");
> 		if (i2c_bus->valid) {
>+			/* add DP i2c bus */
>+			radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");
>+			if (!radeon_dig_connector->dp_i2c_bus)
>+				goto failed;
> 			radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP");
> 			if (!radeon_connector->ddc_bus)
> 				goto failed;
> 		}
> 		subpixel_order = SubPixelHorizontalRGB;
>+		drm_connector_attach_property(&radeon_connector->base,
>+					      rdev->mode_info.coherent_mode_property,
>+					      1);
> 		break;
> 	case DRM_MODE_CONNECTOR_SVIDEO:
> 	case DRM_MODE_CONNECTOR_Composite:
>@@ -1200,7 +1207,6 @@ radeon_add_atom_connector(struct drm_device *dev,
> 			if (!radeon_connector->ddc_bus)
> 				goto failed;
> 		}
>-		drm_mode_create_scaling_mode_property(dev);
> 		drm_connector_attach_property(&radeon_connector->base,
> 					      dev->mode_config.scaling_mode_property,
> 					      DRM_MODE_SCALE_FULLSCREEN);
>diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
>index a2d40d8..bb44bb2 100644
>--- a/drivers/gpu/drm/radeon/radeon_display.c
>+++ b/drivers/gpu/drm/radeon/radeon_display.c
>@@ -660,7 +660,7 @@ int radeon_modeset_create_props(struct radeon_device *rdev)
> 			return -ENOMEM;
> 
> 		rdev->mode_info.coherent_mode_property->values[0] = 0;
>-		rdev->mode_info.coherent_mode_property->values[0] = 1;
>+		rdev->mode_info.coherent_mode_property->values[1] = 1;
> 	}
> 
> 	if (!ASIC_IS_AVIVO(rdev)) {
>@@ -684,7 +684,7 @@ int radeon_modeset_create_props(struct radeon_device *rdev)
> 	if (!rdev->mode_info.load_detect_property)
> 		return -ENOMEM;
> 	rdev->mode_info.load_detect_property->values[0] = 0;
>-	rdev->mode_info.load_detect_property->values[0] = 1;
>+	rdev->mode_info.load_detect_property->values[1] = 1;
> 
> 	drm_mode_create_scaling_mode_property(rdev->ddev);
> 
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 24263: 29985 | 31845

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.