From patchwork Mon Jul 4 05:15:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 1651736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=od+Zn9Ce; dkim-atps=neutral Authentication-Results: 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LbvD70SFpz9s1l for ; Mon, 4 Jul 2022 15:16:21 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o8ERP-0006x3-6n; Mon, 04 Jul 2022 05:16:11 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o8ERM-0006wI-ID for kernel-team@lists.ubuntu.com; Mon, 04 Jul 2022 05:16:08 +0000 Received: from localhost.localdomain (unknown [222.129.34.149]) (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-1.canonical.com (Postfix) with ESMTPSA id 2CC343F389 for ; Mon, 4 Jul 2022 05:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656911768; bh=9aE0I0AnZOk3HeNeJgQT6CIQzvx+Mvo9pptuy5FMhZQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=od+Zn9CebifNEhfG1pPibfOOm6jvOMJQYuddNzR1HRFLdFhnP7mn2lHgJLLaRWzlw EvxUHuNn3BLdvwtNI8b0/KO3InzdWs+Vp4QM6+ZRBloeSQ3zhVpKwA253Me5+P+rEr nwPsffCXvQAqBP02FrFiZXWjcJM8Qt6kprNU/Nhnjf8t4wnxk131GSNnNUr3DbunOI UERtvm/JUgNj16wVvMiK2NLuBxOom0QW9dNXpfCMznwLCgnh9Qjxn3YeMDMo+ADWWx TznusFGfKOyAvjtzq4ETGip+1brCjaWdY5q7EDJRsAtMkfKLRyr/23YxcWGCPjsNgq Hbba0RyGPyRAA== From: Aaron Ma To: kernel-team@lists.ubuntu.com Subject: [OEM-5.14/Jammy][PATCH 1/1] UBUNTU: SAUCE: Revert "drm/i915/display: Remove check for low voltage sku for max dp source rate" Date: Mon, 4 Jul 2022 13:15:54 +0800 Message-Id: <20220704051554.80033-3-aaron.ma@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220704051554.80033-1-aaron.ma@canonical.com> References: <20220704051554.80033-1-aaron.ma@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/1980621 This reverts commit ed3fc6452562128cdd3c6f9ce8dc24ca4651d1cf. This commit was claimed to backport commit 73867c8709b5 ("drm/i915/display: Remove check for low voltage sku for max dp source rate") that is reverted by upstream: commit c7b28f52f406 ("drm/i915/display: Re-add check for low voltage sku for max dp source rate") But it's not. So revert it instead of upstream commit. It causes blanck screen on ThinkPad ADL platform. Signed-off-by: Aaron Ma Acked-by: Stefan Bader --- drivers/gpu/drm/i915/display/intel_dp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 45ce9846ab973..631cf7d4323c8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -283,10 +283,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) if (DISPLAY_VER(dev_priv) >= 11) { source_rates = icl_rates; size = ARRAY_SIZE(icl_rates); - if (IS_ALDERLAKE_P(dev_priv) || IS_ALDERLAKE_S(dev_priv) || - IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv)) - max_rate = 810000; - else if (IS_JSL_EHL(dev_priv)) + if (IS_JSL_EHL(dev_priv)) max_rate = ehl_max_source_rate(intel_dp); else max_rate = icl_max_source_rate(intel_dp);