From patchwork Wed Sep 8 02:42:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1525603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=Cp3wZ/zk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 ozlabs.org (Postfix) with ESMTPS id 4H45yy6vqFz9tjw; Wed, 8 Sep 2021 12:42:49 +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 1mNnXw-0005Kl-E8; Wed, 08 Sep 2021 02:42:44 +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 1mNnXv-0005KY-23 for kernel-team@lists.ubuntu.com; Wed, 08 Sep 2021 02:42:43 +0000 Received: from localhost.localdomain (1-171-98-108.dynamic-ip.hinet.net [1.171.98.108]) (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 183383F108 for ; Wed, 8 Sep 2021 02:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631068962; bh=Jm9xDZhJ8A6nXakobkV/x/3RwERMtzrTU/j2eZyqIbE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Cp3wZ/zk3ql2tgk7Wz74U2fNkArWAdwhiIbNMtXOxUZ52rgB9SoE7hJPfvgqQaNmb gZrvVO/4XbYBGn73VVJqZymz8HD7vuZQ1KwWJT6vCNcj9c1+RtpWoSA1UZoBwZCwtn BTFb/YqInJXU06czV+zrRDpRLaBQG8uhyIvATGpQl/E/bace/BrYJwBfx2kH5nk++Z V6DouVbxRZa2gh1HFl4IpeHA6cw973c3skXyBe7epaKRX4kwz2xAY+rfqdExax2lte 9whFe4E4YvpukVAFmHc97NYK8l0TpqECBTRMuU8NPWOtkt5mx7wl5/PeN5jSnxEcGt 4u5BR+c8EolfQ== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [I/Unstable/OEM-5.13/OEM-5.14] [PATCH 1/2] Revert "UBUNTU: SAUCE: drm/i915/dp: Use max params for older panels" Date: Wed, 8 Sep 2021 10:42:34 +0800 Message-Id: <20210908024235.663851-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210908024235.663851-1-kai.heng.feng@canonical.com> References: <20210908024235.663851-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/1942972 This reverts commit 33ed533625aa7179758db26a61df62a318f4a6ed. Signed-off-by: Kai-Heng Feng --- drivers/gpu/drm/i915/display/intel_dp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 8b0727254fda8..862c1df69cc2a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1338,16 +1338,14 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, limits.min_bpp = intel_dp_min_bpp(pipe_config->output_format); limits.max_bpp = intel_dp_max_bpp(intel_dp, pipe_config); - if (intel_dp->use_max_params || - intel_dp->dpcd[DP_DPCD_REV] <= DP_DPCD_REV_11) { + if (intel_dp->use_max_params) { /* * Use the maximum clock and number of lanes the eDP panel * advertizes being capable of in case the initial fast - * optimal params failed us or the panel is DP 1.1 or earlier. - * The panels are generally designed to support only a single - * clock and lane configuration, and typically on older panels - * these values correspond to the native resolution of the - * panel. + * optimal params failed us. The panels are generally + * designed to support only a single clock and lane + * configuration, and typically on older panels these + * values correspond to the native resolution of the panel. */ limits.min_lane_count = limits.max_lane_count; limits.min_clock = limits.max_clock;