Attachment 41441 Details for Bug 31331 – possible fix

[patch] possible fix

i915-2.6.36.2.diff (text/plain), 2.24 KB, created by Roman Elshin on 2010-12-25 11:08:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Elshin

Created: 2010-12-25 11:08:16 UTC

Size: 2.24 KB

patch

obsolete

>diff -urN a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>--- a/drivers/gpu/drm/i915/intel_display.c	2010-12-10 01:17:27.000000000 +0300
>+++ b/drivers/gpu/drm/i915/intel_display.c	2010-12-25 19:28:53.000000000 +0300
>@@ -2043,15 +2043,11 @@
> 				int reg;
> 
> 				reg = I915_READ(trans_dp_ctl);
>-				reg &= ~(TRANS_DP_PORT_SEL_MASK |
>-					 TRANS_DP_SYNC_MASK);
>+				reg &= ~TRANS_DP_PORT_SEL_MASK;
> 				reg |= (TRANS_DP_OUTPUT_ENABLE |
>-					TRANS_DP_ENH_FRAMING);
>-
>-				if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)
>-				      reg |= TRANS_DP_HSYNC_ACTIVE_HIGH;
>-				if (crtc->mode.flags & DRM_MODE_FLAG_PVSYNC)
>-				      reg |= TRANS_DP_VSYNC_ACTIVE_HIGH;
>+					TRANS_DP_ENH_FRAMING |
>+					TRANS_DP_VSYNC_ACTIVE_HIGH |
>+					TRANS_DP_HSYNC_ACTIVE_HIGH);
> 
> 				switch (intel_trans_dp_port_sel(crtc)) {
> 				case PCH_DP_B:
>diff -urN a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>--- a/drivers/gpu/drm/i915/intel_hdmi.c	2010-12-10 01:17:27.000000000 +0300
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c	2010-12-25 17:40:17.000000000 +0300
>@@ -59,11 +59,10 @@
> 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
> 	u32 sdvox;
> 
>-	sdvox = SDVO_ENCODING_HDMI | SDVO_BORDER_ENABLE;
>-	if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
>-		sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
>-	if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
>-		sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
>+	sdvox = SDVO_ENCODING_HDMI |
>+		SDVO_BORDER_ENABLE |
>+		SDVO_VSYNC_ACTIVE_HIGH |
>+		SDVO_HSYNC_ACTIVE_HIGH;
> 
> 	if (intel_hdmi->has_hdmi_sink) {
> 		sdvox |= SDVO_AUDIO_ENABLE;
>diff -urN a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
>--- a/drivers/gpu/drm/i915/intel_sdvo.c	2010-12-10 01:17:27.000000000 +0300
>+++ b/drivers/gpu/drm/i915/intel_sdvo.c	2010-12-25 17:38:49.000000000 +0300
>@@ -1177,11 +1177,9 @@
> 
> 	/* Set the SDVO control regs. */
> 	if (IS_I965G(dev)) {
>-		sdvox |= SDVO_BORDER_ENABLE;
>-		if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
>-			sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
>-		if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
>-			sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
>+		sdvox |= SDVO_BORDER_ENABLE |
>+			SDVO_VSYNC_ACTIVE_HIGH |
>+			SDVO_HSYNC_ACTIVE_HIGH;
> 	} else {
> 		sdvox |= I915_READ(intel_sdvo->sdvo_reg);
> 		switch (intel_sdvo->sdvo_reg) {

Actions: View | Splinter Review

Attachments on bug 31331: 39985 | 41441

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.