Attachment 95712 Details for Bug 76103 – [PATCH 3/3] drm/i915: Enable/disable planes as the last/first thing

[patch] [PATCH 3/3] drm/i915: Enable/disable planes as the last/first thing

0003-drm-i915-Enable-disable-planes-as-the-last-first-thi.patch (text/plain), 2.58 KB, created by Ville Syrjala on 2014-03-13 11:08:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2014-03-13 11:08:18 UTC

Size: 2.58 KB

patch

obsolete

>From c7a6e28bbd309532382e8a1fdb5ac04f8461af45 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Thu, 13 Mar 2014 11:21:16 +0200
>Subject: [PATCH 3/3] drm/i915: Enable/disable planes as the last/first thing
> during modeset on gmch platforms
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 9b8a7c7..b9a9463 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -4176,14 +4176,15 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
> 
> 	intel_update_watermarks(crtc);
> 	intel_enable_pipe(dev_priv, pipe, false, is_dsi);
>+
>+	for_each_encoder_on_crtc(dev, crtc, encoder)
>+		encoder->enable(encoder);
>+
> 	intel_enable_primary_plane(dev_priv, plane, pipe);
> 	intel_enable_planes(crtc);
> 	intel_crtc_update_cursor(crtc, true);
> 
> 	intel_update_fbc(dev);
>-
>-	for_each_encoder_on_crtc(dev, crtc, encoder)
>-		encoder->enable(encoder);
> }
> 
> static void i9xx_crtc_enable(struct drm_crtc *crtc)
>@@ -4214,6 +4215,10 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
> 
> 	intel_update_watermarks(crtc);
> 	intel_enable_pipe(dev_priv, pipe, false, false);
>+
>+	for_each_encoder_on_crtc(dev, crtc, encoder)
>+		encoder->enable(encoder);
>+
> 	intel_enable_primary_plane(dev_priv, plane, pipe);
> 	intel_enable_planes(crtc);
> 	/* The fixup needs to happen before cursor is enabled */
>@@ -4225,9 +4230,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
> 	intel_crtc_dpms_overlay(intel_crtc, true);
> 
> 	intel_update_fbc(dev);
>-
>-	for_each_encoder_on_crtc(dev, crtc, encoder)
>-		encoder->enable(encoder);
> }
> 
> static void i9xx_pfit_disable(struct intel_crtc *crtc)
>@@ -4257,9 +4259,6 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
> 	if (!intel_crtc->active)
> 		return;
> 
>-	for_each_encoder_on_crtc(dev, crtc, encoder)
>-		encoder->disable(encoder);
>-
> 	/* Give the overlay scaler a chance to disable if it's on this pipe */
> 	intel_crtc_wait_for_pending_flips(crtc);
> 	drm_vblank_off(dev, pipe);
>@@ -4272,6 +4271,9 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
> 	intel_disable_planes(crtc);
> 	intel_disable_primary_plane(dev_priv, plane, pipe);
> 
>+	for_each_encoder_on_crtc(dev, crtc, encoder)
>+		encoder->disable(encoder);
>+
> 	intel_disable_pipe(dev_priv, pipe);
> 
> 	i9xx_pfit_disable(intel_crtc);
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 76103: 95693 | 95694 | 95710 | 95711 | 95712 | 95713 | 95715 | 95718 | 95724 | 95785 | 96446 | 96448 | 96743

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.