Attachment 40778 Details for Bug 32078 – Sanitize modesetting registers.(v2)

[patch] Sanitize modesetting registers.(v2)

0001-drm-i915-Clean-conflicting-modesetting-registers-upo.patch (text/plain), 2.44 KB, created by Chris Wilson on 2010-12-03 07:53:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-12-03 07:53:55 UTC

Size: 2.44 KB

patch

obsolete

>From cacf75ac955ed580c4d319f13b42ff82a8049a7c Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 3 Dec 2010 15:37:31 +0000
>Subject: [PATCH] drm/i915: Clean conflicting modesetting registers upon init
>
>If we leave the registers in a conflicting state then when we attempt
>to teardown the active mode, we will not disable the pipes and planes
>in the correct order -- leaving a plane reading from a disabled pipe and
>possibly leading to undefined behaviour.
>
>Reported-by: Andy Whitcroft <apw@canonical.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32078
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_display.c |   40 ++++++++++++++++++++++++++++++++++
> 1 files changed, 40 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index f7962b7..b86859e 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -5248,6 +5248,44 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
> 	.page_flip = intel_crtc_page_flip,
> };
> 
>+static void intel_sanitize_modesetting(struct drm_device *dev,
>+				       int pipe, int plane)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	u32 reg, val;
>+
>+	if (HAS_PCH_SPLIT(dev))
>+		return;
>+
>+	/* Who knows what state these registers were left in by the BIOS or
>+	 * grub? If they don't match our expectations then we will likely fail
>+	 * to switch modes correctly.
>+	 */
>+
>+	reg = DSPCNTR(plane);
>+	val = I915_READ(reg);
>+
>+	if ((val & DISPLAY_PLANE_ENABLE) == 0)
>+		return;
>+	if (!!(val & DISPPLANE_SEL_PIPE_MASK) == pipe)
>+		return;
>+
>+	/* This display plane is active and attached to the other CPU pipe. */
>+	pipe = !pipe;
>+
>+	I915_WRITE(reg, val & ~DISPLAY_PLANE_ENABLE);
>+	intel_flush_display_plane(dev, plane);
>+
>+	if (IS_GEN2(dev))
>+		intel_wait_for_vblank(dev, pipe);
>+
>+	reg = PIPECONF(pipe);
>+	val = I915_READ(reg);
>+	if (val & PIPECONF_ENABLE) {
>+		I915_WRITE(reg, val & ~PIPECONF_ENABLE);
>+		intel_wait_for_pipe_off(dev, pipe);
>+	}
>+}
> 
> static void intel_crtc_init(struct drm_device *dev, int pipe)
> {
>@@ -5299,6 +5337,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
> 
> 	setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,
> 		    (unsigned long)intel_crtc);
>+
>+	intel_sanitize_modesetting(dev, intel_crtc->pipe, intel_crtc->plane);
> }
> 
> int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 32078: 40771 | 40772 | 40773 | 40774 | 40777 | 40778

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.