Attachment 31271 Details for Bug 21767 – deal with connectors sourced to the same encoder v5

[patch] deal with connectors sourced to the same encoder v5

bug21767-5.diff (text/plain), 1.77 KB, created by Alex Deucher on 2009-11-17 09:46:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-11-17 09:46:22 UTC

Size: 1.77 KB

patch

obsolete

>diff --git a/src/radeon_output.c b/src/radeon_output.c
>index 9d9a16c..a24a98d 100644
>--- a/src/radeon_output.c
>+++ b/src/radeon_output.c
>@@ -322,10 +322,28 @@ radeon_ddc_connected(xf86OutputPtr output)
> 	case CONNECTOR_DVI_D:
> 	case CONNECTOR_HDMI_TYPE_A:
> 	    if (radeon_output->shared_ddc) {
>+		xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (output->scrn);
>+		int i;
>+
> 		if (monitor_is_digital(MonInfo))
> 		    MonType = MT_DFP;
> 		else
> 		    MonType = MT_NONE;
>+
>+		for (i = 0; i < config->num_output; i++) {
>+		    if (output != config->output[i]) {
>+			RADEONOutputPrivatePtr other_radeon_output =
>+			    config->output[i]->driver_private;
>+			if (radeon_output->devices & other_radeon_output->devices) {
>+			    /* XXX: choose HDMI or DVI based on edid */
>+			    if (radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_A) {
>+				ErrorF("HDMI on shared encoder\n");
>+				MonType = MT_NONE;
>+				break;
>+			    }
>+			}
>+		    }
>+		}
> 	    } else
> 		MonType = MT_DFP;
> 	    break;
>@@ -420,6 +438,25 @@ radeon_dpms(xf86OutputPtr output, int mode)
>     if ((mode == DPMSModeOn) && radeon_output->enabled)
> 	return;
> 
>+    if ((mode != DPMSModeOn) && radeon_output->shared_ddc) {
>+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (output->scrn);
>+	int i;
>+
>+	for (i = 0; i < config->num_output; i++) {
>+	    if (output != config->output[i]) {
>+		RADEONOutputPrivatePtr other_radeon_output =
>+		    config->output[i]->driver_private;
>+		if (radeon_output->devices & other_radeon_output->devices) {
>+		    /* XXX: choose HDMI or DVI based on edid */
>+		    if (radeon_output->ConnectorType == CONNECTOR_HDMI_TYPE_A) {
>+			ErrorF("dpms HDMI on shared encoder\n");
>+			return;
>+		    }
>+		}
>+	    }
>+	}
>+    }
>+
>     if (IS_AVIVO_VARIANT || info->r4xx_atom) {
> 	atombios_output_dpms(output, mode);
>     } else {

Actions: View | Splinter Review

Attachments on bug 21767: 25910 | 25911 | 25912 | 25913 | 25914 | 25915 | 25923 | 25924 | 25933 | 31205 | 31248 | 31249 | 31250 | 31251 | 31252 | 31262 | 31267 | 31268 | 31269 | 31270 | 31271 | 31274 | 31275 | 31277 | 31280

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.