This reverts commit b84857c06ef9e72d09fadafdbb3ce9af64af954f, as it's a duplicate of commit eb7bf11e8ef1 ("drm/i915/opregion: check port number bounds for SWSCI display power state").
Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Yu Liao liaoyu15@huawei.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;
On Tue, May 17, 2022 at 08:49:32PM +0800, Yu Liao wrote:
This reverts commit b84857c06ef9e72d09fadafdbb3ce9af64af954f, as it's a duplicate of commit eb7bf11e8ef1 ("drm/i915/opregion: check port number bounds for SWSCI display power state").
Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Yu Liao liaoyu15@huawei.com
drivers/gpu/drm/i915/display/intel_opregion.c | 15 --------------- 1 file changed, 15 deletions(-)
Someone sent this right before you did: https://lore.kernel.org/r/20220517000835.2450573-1-gthelen@google.com
I'll merge them together...
thanks,
greg k-h
Thanks, and this issue also exists in 5.15 and 5.17.
On 2022/5/19 20:58, Greg KH wrote:
On Tue, May 17, 2022 at 08:49:32PM +0800, Yu Liao wrote:
This reverts commit b84857c06ef9e72d09fadafdbb3ce9af64af954f, as it's a duplicate of commit eb7bf11e8ef1 ("drm/i915/opregion: check port number bounds for SWSCI display power state").
Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Yu Liao liaoyu15@huawei.com
drivers/gpu/drm/i915/display/intel_opregion.c | 15 --------------- 1 file changed, 15 deletions(-)
Someone sent this right before you did: https://lore.kernel.org/r/20220517000835.2450573-1-gthelen@google.com
I'll merge them together...
thanks,
greg k-h .
linux-stable-mirror@lists.linaro.org