FAILED: patch "[PATCH] drm/i915: Don't leave old junk in ilk active watermarks on" failed to apply to 3.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
7045c3689f148a0c95f42bae8ef3eb2829ac7de9Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Fri, 13 May 2016 17:55:17 +0300
Subject: [PATCH] drm/i915: Don't leave old junk in ilk active watermarks on
readout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When we read out the watermark state from the hardware we're supposed to transfer that into the active watermarks, but currently we fail to any part of the active watermarks that isn't explicitly written. Let's clear it all upfront.
Looks like this has been like this since the beginning, when I added the readout. No idea why I didn't clear it up.
drivers/gpu/drm/i915/intel_pm.c +2 -0
@@ -3904,6 +3904,8 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) hw->wm_linetime[pipe] =I915_READ (PIPE_WM_LINETIME (pipe)); +memset (active,0 ,sizeof (*active)); + active->pipe_enabled = intel_crtc->active;if (active->pipe_enabled) {