Skip to contentSkip to conversation

Patch "Revert "drm/i915: Check live status before reading edid"" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 28, 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

Revert "drm/i915: Check live status before reading edid"

to the 4.8-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:
revert-drm-i915-check-live-status-before-reading-edid.patch
and it can be found in the queue-4.8 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 23f889bdf6ee5cfff012d8b09f6bec920c691696 Mon Sep 17 00:00:00 2001

From: David Weinehall <[email protected]>
Date: Wed, 17 Aug 2016 15:47:48 +0300
Subject: Revert "drm/i915: Check live status before reading edid"

From: David Weinehall <[email protected]>

commit 23f889bdf6ee5cfff012d8b09f6bec920c691696 upstream.

This reverts commit 237ed86c693d8a8e4db476976aeb30df4deac74b.

Our current implementation of live status check (repeat 9 times with 10ms delays between each attempt as a workaround for buggy displays) imposes a rather serious penalty, time wise, on intel_hdmi_detect(). Since we we already skip live status checks on platforms before gen 7, and since we seem to have coped quite well before the live status check was introduced for newer platforms too, the previous behaviour is probably preferable, at least unless someone can point to a use-case that the live status check improves (apart from "Bspec says so".)

Fixes 237ed86c693d ("drm/i915: Check live status before reading edid")
Fixes f8d03ea0053b ("drm/i915: increase the tries for HDMI hotplug live status checking")

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97139
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94014

---
 drivers/gpu/drm/i915/intel_dp.c   |    2 -
 drivers/gpu/drm/i915/intel_drv.h  |    2 -
 drivers/gpu/drm/i915/intel_hdmi.c |   43 ++++++++------------------------------
 3 files changed, 11 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -4148,7 +4148,7 @@ static bool bxt_digital_port_connected(s
  *
  * Return %true if @port is connected, %false otherwise.
  */
-bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
+static bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
 					 struct intel_digital_port *port)
 {
 	if (HAS_PCH_IBX(dev_priv))
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -1388,8 +1388,6 @@ void intel_edp_drrs_disable(struct intel
 void intel_edp_drrs_invalidate(struct drm_device *dev,
 		unsigned frontbuffer_bits);
 void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffer_bits);
-bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
-					 struct intel_digital_port *port);
 
 void
 intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
drivers/gpu/drm/i915/intel_hdmi.c +10 -33

78 lines not on this page · raw message

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

queue-4.8/revert-drm-i915-check-live-status-before-reading-edid.patch