5.17-stable patches

added patches:
	revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch

diff --git a/queue-5.17/revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch b/queue-5.17/revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch
new file mode 100644 (file)
index 0000000..29abb53
--- /dev/null
+++ b/queue-5.17/revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch
@@ -0,0 +1,50 @@
+From gthelen@google.com  Thu May 19 14:59:02 2022
+From: Greg Thelen <gthelen@google.com>
+Date: Mon, 16 May 2022 17:08:35 -0700
+Subject: Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"
+To: stable@vger.kernel.org
+Cc: Jani Nikula <jani.nikula@intel.com>, Greg Thelen <gthelen@google.com>
+Message-ID: <20220517000835.2450573-1-gthelen@google.com>
+
+From: Greg Thelen <gthelen@google.com>
+
+This reverts commit b84857c06ef9e72d09fadafdbb3ce9af64af954f.
+
+5.10 stable contains 2 identical commits:
+1. commit eb7bf11e8ef1 ("drm/i915/opregion: check port number bounds for SWSCI display power state")
+2. commit b84857c06ef9 ("drm/i915/opregion: check port number bounds for SWSCI display power state")
+
+Both commits add separate checks for the same condition. Revert the 2nd
+redundant check to match upstream, which only has one check.
+
+Signed-off-by: Greg Thelen <gthelen@google.com>
+Signed-off-by: Yu Liao <liaoyu15@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/display/intel_opregion.c |   15 ---------------
+ 1 file changed, 15 deletions(-)
+
+--- a/drivers/gpu/drm/i915/display/intel_opregion.c
++++ b/drivers/gpu/drm/i915/display/intel_opregion.c
+@@ -375,21 +375,6 @@ int intel_opregion_notify_encoder(struct
+               return -EINVAL;
+       }
+ 
+-      /*
+-       * The port numbering and mapping here is bizarre. The now-obsolete
+-       * swsci spec supports ports numbered [0..4]. Port E is handled as a
+-       * special case, but port F and beyond are not. The functionality is
+-       * supposed to be obsolete for new platforms. Just bail out if the port
+-       * number is out of bounds after mapping.
+-       */
+-      if (port > 4) {
+-              drm_dbg_kms(&dev_priv->drm,
+-                          "[ENCODER:%d:%s] port %c (index %u) out of bounds for display power state notification\n",
+-                          intel_encoder->base.base.id, intel_encoder->base.name,
+-                          port_name(intel_encoder->port), port);
+-              return -EINVAL;
+-      }
+-
+       if (!enable)
+               parm |= 4 << 8;
+ 

diff --git a/queue-5.17/series b/queue-5.17/series
index 79c3a60d7bde5b0e078ffd5ebf2c934c5fd66e94..80224e60fcf3e81fbd97a2c3bea7856e10e8a9ff 100644 (file)
--- a/queue-5.17/series
+++ b/queue-5.17/series
@@ -13,3 +13,4 @@ watchdog-sp5100_tco-move-timer-initialization-into-function.patch
 watchdog-sp5100_tco-refactor-mmio-base-address-initialization.patch
 watchdog-sp5100_tco-add-initialization-using-efch-mmio.patch
 watchdog-sp5100_tco-enable-family-17h-cpus.patch
+revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch