Attachment 127554 Details for Bug 98214 – [PATCH] drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing things

[patch] [PATCH] drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing things

0001-drm-i915-Fix-cdclk-vs.-dev_cdclk-mess-when-not-recom.patch (text/plain), 1.49 KB, created by Ville Syrjala on 2016-10-26 17:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2016-10-26 17:34:17 UTC

Size: 1.49 KB

patch

obsolete

>From f220529ca72bf34c10a41ae2bb78825c63f968bd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Wed, 26 Oct 2016 20:23:23 +0300
>Subject: [PATCH] drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing
> things
>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 | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 2a5a7c2868de..cbd9255ef652 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -14039,8 +14039,10 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
> 
> 		DRM_DEBUG_KMS("New cdclk calculated to be atomic %u, actual %u\n",
> 			      intel_state->cdclk, intel_state->dev_cdclk);
>-	} else
>+	} else {
> 		to_intel_atomic_state(state)->cdclk = dev_priv->atomic_cdclk_freq;
>+		to_intel_atomic_state(state)->dev_cdclk = dev_priv->cdclk_freq;
>+	}
> 
> 	intel_modeset_clear_plls(state);
> 
>@@ -14141,8 +14143,10 @@ static int intel_atomic_check(struct drm_device *dev,
> 
> 		if (ret)
> 			return ret;
>-	} else
>-		intel_state->cdclk = dev_priv->cdclk_freq;
>+	} else {
>+		intel_state->cdclk = dev_priv->atomic_cdclk_freq;
>+		intel_state->dev_cdclk = dev_priv->cdclk_freq;
>+	}
> 
> 	ret = drm_atomic_helper_check_planes(dev, state);
> 	if (ret)
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 98214: 127470 | 127471 | 127472 | 127473 | 127551 | 127554

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.