Attachment 71791 Details for Bug 57434 – i915-ensure-that-VGA-plane-is-disabled.patch

[patch] i915-ensure-that-VGA-plane-is-disabled.patch

0001-i915-ensure-that-VGA-plane-is-disabled.patch (text/plain), 1.80 KB, created by Krzysztof Mazur on 2012-12-19 09:20:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Mazur

Created: 2012-12-19 09:20:26 UTC

Size: 1.80 KB

patch

obsolete

>From da9f8322ba549a28f6586f604dfed84878ba2be0 Mon Sep 17 00:00:00 2001
>From: Krzysztof Mazur <krzysiek@podlesie.net>
>Date: Wed, 19 Dec 2012 10:15:13 +0100
>Subject: [PATCH] i915: ensure that VGA plane is disabled
>
>Some broken systems (like HP nc6120) in some cases, usually after LID
>close/open, enable VGA plane, making display unusable (black screen on LVDS,
>some strange mode on VGA). We used to disable VGA plane only once at startup.
>Now we also check, if VGA plane is still disabled while changing mode,
>and fix that if something changed it.
>
>Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
>---
> drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 437b56a..26b0143 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -8712,6 +8712,23 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> 	 * the crtc fixup. */
> }
> 
>+static void i915_redisable_vga(struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	u32 vga_reg;
>+
>+	if (HAS_PCH_SPLIT(dev))
>+		vga_reg = CPU_VGACNTRL;
>+	else
>+		vga_reg = VGACNTRL;
>+
>+	if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {
>+		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
>+		I915_WRITE(vga_reg, VGA_DISP_DISABLE);
>+		POSTING_READ(vga_reg);
>+	}
>+}
>+
> /* Scan out the current hw modeset state, sanitizes it and maps it into the drm
>  * and i915 state tracking structures. */
> void intel_modeset_setup_hw_state(struct drm_device *dev,
>@@ -8823,6 +8840,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
> 	} else {
> 		intel_modeset_update_staged_output_state(dev);
> 	}
>+	i915_redisable_vga(dev);
> 
> 	intel_modeset_check_state(dev);
> 
>-- 
>1.8.1.rc2
>

Actions: View | Splinter Review

Attachments on bug 57434: 70463 | 70464 | 70470 | 70798 | 71791

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.