This is a note to let you know that I've just added the patch titled
Revert "drm/i915/display: Fix handling of enable_psr parameter"
to the 5.19-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-display-fix-handling-of-enable_psr-parameter.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Oct 4 03:42:54 PM CEST 2022
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 4 Oct 2022 15:08:40 +0200
Subject: Revert "drm/i915/display: Fix handling of enable_psr parameter"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 0d0f5ca7f241edf07f90599e4e7fadf1ddce97db which is
commit 5c57c099f442acab13129c9e15ad2a0c31151c98 upstream.
This is part of a series of i915 patches that were backported to 5.19.12
but found to be incomplete and caused problems on many systems so they
are being reverted.
Reported-by: Jerry Ling <jiling@xxxxxxx>
Reported-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Cc: Thorsten Leemhuis <regressions@xxxxxxxxxxxxx>
Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
Cc: Jouni Högander <jouni.hogander@xxxxxxxxx>
Cc: Mika Kahola <mika.kahola@xxxxxxxxx>
Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
Cc: Jouni Högander <jouni.hogander@xxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Link: https://lore.kernel.org/all/55905860-adf9-312c-69cc-491ac8ce1a8b@xxxxxxx/
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/display/intel_psr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -86,13 +86,10 @@
static bool psr_global_enabled(struct intel_dp *intel_dp)
{
- struct intel_connector *connector = intel_dp->attached_connector;
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
switch (intel_dp->psr.debug & I915_PSR_DEBUG_MODE_MASK) {
case I915_PSR_DEBUG_DEFAULT:
- if (i915->params.enable_psr == -1)
- return connector->panel.vbt.psr.enable;
return i915->params.enable_psr;
case I915_PSR_DEBUG_DISABLE:
return false;
@@ -2374,6 +2371,10 @@ void intel_psr_init(struct intel_dp *int
intel_dp->psr.source_support = true;
+ if (dev_priv->params.enable_psr == -1)
+ if (!connector->panel.vbt.psr.enable)
+ dev_priv->params.enable_psr = 0;
+
/* Set link_standby x link_off defaults */
if (DISPLAY_VER(dev_priv) < 12)
/* For new platforms up to TGL let's respect VBT back again */
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.19/revert-drm-i915-pps-split-pps_init_delays-into-distinct-parts.patch
queue-5.19/revert-drm-i915-bios-split-vbt-data-into-per-panel-vs.-global-parts.patch
queue-5.19/revert-drm-i915-extract-intel_edp_fixup_vbt_bpp.patch
queue-5.19/revert-drm-i915-bios-split-vbt-parsing-to-global-vs.-panel-specific-parts.patch
queue-5.19/revert-drm-i915-dsi-filter-invalid-backlight-and-cabc-ports.patch
queue-5.19/revert-drm-i915-dsi-fix-dual-link-dsi-backlight-and-cabc-ports-for-display-11.patch
queue-5.19/revert-drm-i915-display-fix-handling-of-enable_psr-parameter.patch
queue-5.19/revert-drm-i915-bios-split-parse_driver_features-into-two-parts.patch
