Skip to contentSkip to conversation

Patch "drm/i915: Start WM computation from scratch on ILK-BDW" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 1, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: Start WM computation from scratch on ILK-BDW

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-start-wm-computation-from-scratch-on-ilk-bdw.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f1ecaf8f9c9924badd4c8f690e39632d31edb500 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Thu, 14 Jan 2016 14:53:34 +0200
Subject: drm/i915: Start WM computation from scratch on ILK-BDW
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Ville Syrjälä <[email protected]>

commit f1ecaf8f9c9924badd4c8f690e39632d31edb500 upstream.

ilk_compute_pipe_wm() assumes as zeroed pipe_wm structure when it starts. We used to pass such a zeroed struct in, but this got broken when the pipe_wm structure got embedded in the crtc state.

To fix it without too much fuzz, we need to resort to a memset().

Fixes 4e0963c7663b ("drm/i915: Calculate pipe watermarks into CRTC state (v3)")
Cc Matt Roper <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_pm.c +1 -0
@@ -2281,6 +2281,7 @@ static int ilk_compute_pipe_wm(struct in
 		return PTR_ERR(cstate);
 
 	pipe_wm = &cstate->wm.optimal.ilk;
+	memset(pipe_wm, 0, sizeof(*pipe_wm));
 
 	for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
 		ps = drm_atomic_get_plane_state(state,

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/drm-i915-use-fw_domains_put_with_fifo-on-hsw.patch queue-4.5/drm-i915-exit-cherryview_irq_handler-after-one-pass.patch queue-4.5/drm-i915-skl_update_scaler-wants-a-rotation-bitmask-instead-of-bit-number.patch queue-4.5/drm-i915-cleanup-phys-status-page-too.patch queue-4.5/drm-i915-use-the-active-wm-config-for-merging-on-ilk-bdw.patch queue-4.5/drm-i915-start-wm-computation-from-scratch-on-ilk-bdw.patch queue-4.5/drm-i915-fix-race-condition-in-intel_dp_destroy_mst_connector.patch queue-4.5/drm-i915-pass-the-correct-encoder-to-intel_ddi_clk_select-with-mst.patch