Attachment 130778 Details for Bug 97960 – relax watermark calculations

[patch] relax watermark calculations

file_97960.txt (text/plain), 1.09 KB, created by Maarten Lankhorst on 2017-04-10 14:35:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Lankhorst

Created: 2017-04-10 14:35:46 UTC

Size: 1.09 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>index 55e1e88cd361..daadc111d401 100644
>--- a/drivers/gpu/drm/i915/intel_pm.c
>+++ b/drivers/gpu/drm/i915/intel_pm.c
>@@ -2639,7 +2639,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
> 				       struct intel_crtc_state *newstate)
> {
> 	struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate;
>-	struct intel_pipe_wm *b = &intel_crtc->wm.active.ilk;
>+	const struct drm_crtc_state *old_drm_state =
>+		drm_atomic_get_old_crtc_state(newstate->base.state, &intel_crtc->base);
>+	const struct intel_pipe_wm *b = &to_intel_crtc_state(old_drm_state)->wm.ilk.optimal;
> 	int level, max_level = ilk_wm_max_level(to_i915(dev));
> 
> 	/*
>@@ -2648,6 +2650,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
> 	 * and after the vblank.
> 	 */
> 	*a = newstate->wm.ilk.optimal;
>+	if (!newstate->base.active || drm_atomic_crtc_needs_modeset(&newstate->base))
>+		return 0;
>+
> 	a->pipe_enabled |= b->pipe_enabled;
> 	a->sprites_enabled |= b->sprites_enabled;
> 	a->sprites_scaled |= b->sprites_scaled;

Actions: View | Splinter Review

Attachments on bug 97960: 126828 | 126829 | 130778 | 132677 | 132678 | 132679

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.