From patchwork Fri Feb 24 16:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1747560 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=QUa6o6Iy; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNZpZ2Z8Gz1yYg for ; Sat, 25 Feb 2023 03:19:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pVamt-0007zN-CB; Fri, 24 Feb 2023 16:19:11 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pVamq-0007z0-Vo for kernel-team@lists.ubuntu.com; Fri, 24 Feb 2023 16:19:08 +0000 Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id AF2493F382 for ; Fri, 24 Feb 2023 16:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1677255548; bh=9AsZcLBDmV4wI1QOyhzxmXFzVrVEh2ZTZA2/XmQi00Q=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QUa6o6IylGKcOcqCzYLuMqlZvYpk5VbEPDN9cB792QI9RgimKoVYeKNZORc9Dwghc earoAk/YiwpJap++5Lfy92DOT4AUd9iNk4BabzZoGIwClpbDn3f0l9NPP3iAfW7sNI MxCkO2xLaLlYEW9me2ARiKblvgd5kqWfeETiUvToWsUrRNtEp0/ngWeq+c9rEGP8iP QLsZNRRQQkI4OjkAl83xbqAHjlnEmQAHCfx7oZV5uVidX1Fhq2Kp9pDK0PDDJbmHPT MDb7DqJwTLS8uyer5w5Ua29B7a6jILU+2q08ij5meaW28mWlf04+ExQK1Kq446A9Y5 aPtAltDAg5Gww== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [K/L/Unstable/OEM-6.1] [PATCH 1/1] UBUNTU: SAUCE: drm/i915/display/psr: Disable PSR2 sel fetch on panel SHP 5457 Date: Sat, 25 Feb 2023 00:18:20 +0800 Message-Id: <20230224161820.2200264-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224161820.2200264-1-kai.heng.feng@canonical.com> References: <20230224161820.2200264-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2007516 There's a panel on XPS 9320 flickers since PSR2 sel fetch became enabled by default on Linux kernel >= 5.16. Vendor & Product Identification: Manufacturer: SHP Model: 5457 Temporarily disable PSR2 sel fetch so the panel falls back to use PSR1 while Intel GFX devs are working on the issue [0]. [0] https://gitlab.freedesktop.org/drm/intel/-/issues/7836 Signed-off-by: Kai-Heng Feng --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.h | 2 ++ drivers/gpu/drm/i915/display/intel_psr.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 75070eb07d4b..1e6eed6c8f0e 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4417,7 +4417,7 @@ bool intel_digital_port_connected(struct intel_encoder *encoder) return is_connected; } -static struct edid * +struct edid * intel_dp_get_edid(struct intel_dp *intel_dp) { struct intel_connector *intel_connector = intel_dp->attached_connector; diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index a54902c713a3..b0cedd70104c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -97,6 +97,8 @@ void intel_read_dp_sdp(struct intel_encoder *encoder, unsigned int type); bool intel_digital_port_connected(struct intel_encoder *encoder); +struct edid *intel_dp_get_edid(struct intel_dp *intel_dp); + static inline unsigned int intel_dp_unused_lane_mask(int lane_count) { return ~((1 << lane_count) - 1) & 0xf; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 5b678916e6db..5414b3426ace 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -23,6 +23,7 @@ #include #include +#include #include "display/intel_dp.h" @@ -752,6 +753,24 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state) { struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + struct edid *edid; + + edid = intel_dp_get_edid(intel_dp); + + /* The mfg:prod can be obtained from EDID byte [8-11]. + * For instance, if the first bytes of EDID are + * "00 ff ff ff ff ff ff 00 4d 10 51 15 00 00 00 00", + * the mfg:prod is "4d 10 51 15". + * + * TODO: If the list grows more than three quirks, please make a quirk + * table. + */ + if (edid && edid->mfg_id[0] == 0x4d && edid->mfg_id[1] == 0x10 && + edid->prod_code[0] == 0x51 && edid->prod_code[1] == 0x15) { + drm_info_once(&dev_priv->drm, + "PSR2 sel fetch disabled\n"); + return false; + } if (!dev_priv->params.enable_psr2_sel_fetch && intel_dp->psr.debug != I915_PSR_DEBUG_ENABLE_SEL_FETCH) {