On Mon, May 16, 2022 at 05:08:35PM -0700, Greg Thelen wrote:

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

drivers/gpu/drm/i915/display/intel_opregion.c | 15 --------------- 1 file changed, 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index 6d083b98f6ae..abff2d6cedd1 100644 --- 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 intel_encoder *intel_encoder, 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;

2.36.0.550.gb090851708-goog

Now queued up, thanks.

greg k-h