From: Greg Kroah-Hartman Date: Thu, 19 May 2022 12:59:38 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.9.316~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7085d6633adeff5d45f75124edd2cb8fc11e2758;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch --- diff --git a/queue-5.10/revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch b/queue-5.10/revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch new file mode 100644 index 00000000000..04e1a0dab28 --- /dev/null +++ b/queue-5.10/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 +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 , Greg Thelen +Message-ID: <20220517000835.2450573-1-gthelen@google.com> + +From: Greg Thelen + +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 +Signed-off-by: Yu Liao +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -376,21 +376,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.10/series b/queue-5.10/series index 4c9216b6dbe..bf6093d96f2 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1,3 +1,4 @@ usb-gadget-fix-race-when-gadget-driver-register-via-ioctl.patch io_uring-always-grab-file-table-for-deferred-statx.patch floppy-use-a-statically-allocated-error-counter.patch +revert-drm-i915-opregion-check-port-number-bounds-for-swsci-display-power-state.patch