From: jsg <jsg@openbsd.org>
Date: Wed, 25 May 2022 12:25:25 +0000 (+0000)
Subject: Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d509a14a9b2adb64c0d9f81c1d1bd1a64f858e81;p=openbsd

Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"

From Greg Thelen
11e6a90ffd6294083b808d34ccc5a5ea18ed603e in linux 5.15.y/5.15.42
---

diff --git a/sys/dev/pci/drm/i915/display/intel_opregion.c b/sys/dev/pci/drm/i915/display/intel_opregion.c
index 610a1e40d81..df469af1667 100644
--- a/sys/dev/pci/drm/i915/display/intel_opregion.c
+++ b/sys/dev/pci/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;