Attachment 141764 Details for Bug 105637 – [PATCH] drm/i915: Restore vblank interrupts earlier

[patch] [PATCH] drm/i915: Restore vblank interrupts earlier

0001-drm-i915-Restore-vblank-interrupts-earlier.patch (text/plain), 2.46 KB, created by Ville Syrjala on 2018-09-27 19:41:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2018-09-27 19:41:20 UTC

Size: 2.46 KB

patch

obsolete

>From 59f57847e78d50c1a75830fbe91cfb46bebb93b2 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Thu, 27 Sep 2018 22:29:08 +0300
>Subject: [PATCH] drm/i915: Restore vblank interrupts earlier
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Plane sanitation needs vblank interrups (on account of CxSR disable).
>So let's restore vblank interrupts earlier.
>
>Cc: Dennis <dennis.nezic@utoronto.ca>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105637
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 4710f3aab552..5cd4ea3fa9eb 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -15577,13 +15577,9 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
> 			   I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
> 	}
> 
>-	/* restore vblank interrupts to correct state */
>-	drm_crtc_vblank_reset(&crtc->base);
> 	if (crtc->active) {
> 		struct intel_plane *plane;
> 
>-		drm_crtc_vblank_on(&crtc->base);
>-
> 		/* Disable everything but the primary plane */
> 		for_each_intel_plane_on_crtc(dev, crtc, plane) {
> 			const struct intel_plane_state *plane_state =
>@@ -15925,7 +15921,6 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
> 			     struct drm_modeset_acquire_ctx *ctx)
> {
> 	struct drm_i915_private *dev_priv = to_i915(dev);
>-	enum pipe pipe;
> 	struct intel_crtc *crtc;
> 	struct intel_encoder *encoder;
> 	int i;
>@@ -15938,15 +15933,19 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
> 	/* HW state is read out, now we need to sanitize this mess. */
> 	get_encoder_power_domains(dev_priv);
> 
>-	intel_sanitize_plane_mapping(dev_priv);
>+	for_each_intel_crtc(dev_priv, crtc) {
>+		drm_crtc_vblank_reset(&crtc->base);
> 
>-	for_each_intel_encoder(dev, encoder) {
>-		intel_sanitize_encoder(encoder);
>+		if (crtc->active)
>+			drm_crtc_vblank_on(&crtc->base);
> 	}
> 
>-	for_each_pipe(dev_priv, pipe) {
>-		crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
>+	intel_sanitize_plane_mapping(dev_priv);
>+
>+	for_each_intel_encoder(dev, encoder)
>+		intel_sanitize_encoder(encoder);
> 
>+	for_each_intel_crtc(dev_priv, crtc) {
> 		intel_sanitize_crtc(crtc, ctx);
> 		intel_dump_pipe_config(crtc, crtc->config,
> 				       "[setup_hw_state]");
>-- 
>2.16.4
>

Actions: View | Splinter Review

Attachments on bug 105637: 138232 | 138266 | 139355 | 139646 | 139806 | 141595 | 141596 | 141672 | 141751 | 141764 | 141765 | 141768 | 141775 | 141782 | 141858

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.