Skip to contentSkip to conversation

Patch "drm/i915: Use fw_domains_put_with_fifo() on HSW" 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: Use fw_domains_put_with_fifo() on HSW

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-use-fw_domains_put_with_fifo-on-hsw.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 31318a922395ec9e78d6e2ddf70779355afc7594 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Thu, 14 Apr 2016 14:39:02 +0300
Subject: drm/i915: Use fw_domains_put_with_fifo() on HSW
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

commit 31318a922395ec9e78d6e2ddf70779355afc7594 upstream.

HSW still has the wake FIFO, so let's check it.

Cc Mika Kuoppala <[email protected]>
Cc Deepak S <[email protected]>
Fixes 05a2fb157e44 ("drm/i915: Consolidate forcewake code")
(cherry picked from commit 3d7d0c85e41afb5a05e98b3a8a72c38357f02594)
---
 drivers/gpu/drm/i915/intel_uncore.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_uncore.c +5 -1
@@ -1155,7 +1155,11 @@ static void intel_uncore_fw_domains_init
 	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
 		dev_priv->uncore.funcs.force_wake_get =
 			fw_domains_get_with_thread_status;
-		dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
+		if (IS_HASWELL(dev))
+			dev_priv->uncore.funcs.force_wake_put =
+				fw_domains_put_with_fifo;
+		else
+			dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
 		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
 			       FORCEWAKE_MT, FORCEWAKE_ACK_HSW);
 	} else if (IS_IVYBRIDGE(dev)) {

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