Attachment 45532 Details for Bug 35796 – Sanitize output registers after resume v2

[patch] Sanitize output registers after resume v2

0001-drm-i915-Sanitize-the-output-registers-after-resume-v2.patch (text/plain), 4.04 KB, created by Seth Forshee on 2011-04-12 08:28:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Seth Forshee

Created: 2011-04-12 08:28:33 UTC

Size: 4.04 KB

patch

obsolete

>From 813ca89b8ebf874f6f383766122328b6f0fe7b1f Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 12 Apr 2011 06:54:05 +0100
>Subject: [PATCH] drm/i915: Sanitize the output registers after resume
>
>Similar to booting, we need to inspect the state left by the BIOS and
>remove any conflicting bits before we take over. The example reported by
>Seth Forshee is very similar to the bug encountered in the state left by
>grub2, that the crtc pipe<->planning mapping was reversed from our
>expectations and so we failed to turn off the outputs when booting or,
>in this case, resuming.
>
>This patch rearranges the code we already have to clear up the
>conflicting state upon init and calls it from reset (which is called
>after we have lost control of the hardware, i.e. along both the boot and
>resume paths) instead.
>
>Reported-by: Seth Forshee <seth.forshee@canonical.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35796
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_display.c |   68 ++++++++++++++++++----------------
> 1 files changed, 36 insertions(+), 32 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index f1798f2..9e4057b 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -6246,36 +6246,6 @@ cleanup_work:
> 	return ret;
> }
> 
>-static void intel_crtc_reset(struct drm_crtc *crtc)
>-{
>-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>-
>-	/* Reset flags back to the 'unknown' status so that they
>-	 * will be correctly set on the initial modeset.
>-	 */
>-	intel_crtc->dpms_mode = -1;
>-}
>-
>-static struct drm_crtc_helper_funcs intel_helper_funcs = {
>-	.dpms = intel_crtc_dpms,
>-	.mode_fixup = intel_crtc_mode_fixup,
>-	.mode_set = intel_crtc_mode_set,
>-	.mode_set_base = intel_pipe_set_base,
>-	.mode_set_base_atomic = intel_pipe_set_base_atomic,
>-	.load_lut = intel_crtc_load_lut,
>-	.disable = intel_crtc_disable,
>-};
>-
>-static const struct drm_crtc_funcs intel_crtc_funcs = {
>-	.reset = intel_crtc_reset,
>-	.cursor_set = intel_crtc_cursor_set,
>-	.cursor_move = intel_crtc_cursor_move,
>-	.gamma_set = intel_crtc_gamma_set,
>-	.set_config = drm_crtc_helper_set_config,
>-	.destroy = intel_crtc_destroy,
>-	.page_flip = intel_crtc_page_flip,
>-};
>-
> static void intel_sanitize_modesetting(struct drm_device *dev,
> 				       int pipe, int plane)
> {
>@@ -6312,6 +6282,42 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
> 	intel_disable_pipe(dev_priv, pipe);
> }
> 
>+static void intel_crtc_reset(struct drm_crtc *crtc)
>+{
>+	struct drm_device *dev = crtc->dev;
>+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>+
>+	/* Reset flags back to the 'unknown' status so that they
>+	 * will be correctly set on the initial modeset.
>+	 */
>+	intel_crtc->dpms_mode = -1;
>+
>+	/* We need to fix up any BIOS configuration that conflicts with
>+	 * our expectations.
>+	 */
>+	intel_sanitize_modesetting(dev, intel_crtc->pipe, intel_crtc->plane);
>+}
>+
>+static struct drm_crtc_helper_funcs intel_helper_funcs = {
>+	.dpms = intel_crtc_dpms,
>+	.mode_fixup = intel_crtc_mode_fixup,
>+	.mode_set = intel_crtc_mode_set,
>+	.mode_set_base = intel_pipe_set_base,
>+	.mode_set_base_atomic = intel_pipe_set_base_atomic,
>+	.load_lut = intel_crtc_load_lut,
>+	.disable = intel_crtc_disable,
>+};
>+
>+static const struct drm_crtc_funcs intel_crtc_funcs = {
>+	.reset = intel_crtc_reset,
>+	.cursor_set = intel_crtc_cursor_set,
>+	.cursor_move = intel_crtc_cursor_move,
>+	.gamma_set = intel_crtc_gamma_set,
>+	.set_config = drm_crtc_helper_set_config,
>+	.destroy = intel_crtc_destroy,
>+	.page_flip = intel_crtc_page_flip,
>+};
>+
> static void intel_crtc_init(struct drm_device *dev, int pipe)
> {
> 	drm_i915_private_t *dev_priv = dev->dev_private;
>@@ -6361,8 +6367,6 @@ 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.4.1
>

Actions: View | Splinter Review

Attachments on bug 35796: 45043 | 45044 | 45045 | 45046 | 45047 | 45493 | 45498 | 45532

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.