Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"
This reverts commitb84857c06e
. 5.10 stable contains 2 identical commits: 1. commiteb7bf11e8e
("drm/i915/opregion: check port number bounds for SWSCI display power state") 2. commitb84857c06e
("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>
Dieser Commit ist enthalten in:

committet von
Greg Kroah-Hartman

Ursprung
911b362678
Commit
55c820c1b2
@@ -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;
|
||||
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren