Skip to contentSkip to conversation

Patch "drm/i915: Don't init hpd polling for vlv and chv from runtime_suspend()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 30, 2017

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: Don't init hpd polling for vlv and chv from runtime_suspend()

to the 4.9-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-don-t-init-hpd-polling-for-vlv-and-chv-from-runtime_suspend.patch
and it can be found in the queue-4.9 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 21d6e0bde50713922a6520ef84e5fd245b05d468 Mon Sep 17 00:00:00 2001

From: Ander Conselvan de Oliveira <[email protected]>
Date: Fri, 20 Jan 2017 16:28:43 +0200
Subject: drm/i915: Don't init hpd polling for vlv and chv from runtime_suspend()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Ander Conselvan de Oliveira <[email protected]>

commit 21d6e0bde50713922a6520ef84e5fd245b05d468 upstream.

An error in the condition for avoiding the call to intel_hpd_poll_init() for valleyview and cherryview from intel_runtime_suspend() caused it to be called unconditionally. Fix it.

Fixes 19625e85c6ec ("drm/i915: Enable polling when we don't have hpd")
Cc Ville Syrjälä <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
(cherry picked from commit 04313b00b79405f86d815100f85c47a2ee5b8ca0)
---
 drivers/gpu/drm/i915/i915_drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2372,7 +2372,7 @@ static int intel_runtime_suspend(struct
 
 	assert_forcewakes_inactive(dev_priv);
 
-	if (!IS_VALLEYVIEW(dev_priv) || !IS_CHERRYVIEW(dev_priv))
+	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
 		intel_hpd_poll_init(dev_priv);
 
 	DRM_DEBUG_KMS("Device suspended\n");

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

queue-4.9/drm-i915-don-t-init-hpd-polling-for-vlv-and-chv-from-runtime_suspend.patch queue-4.9/drm-i915-check-for-null-atomic-state-in-intel_crtc_disable_noatomic.patch queue-4.9/drm-i915-don-t-leak-edid-in-intel_crt_detect_ddc.patch queue-4.9/drm-i915-fix-calculation-of-rotated-x-and-y-offsets-for-planar-formats.patch