From patchwork Tue Nov 24 10:42:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1405436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 4CgLGc3hKJz9sRR; Tue, 24 Nov 2020 21:43:36 +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 1khVnJ-0002x9-17; Tue, 24 Nov 2020 10:43:33 +0000 Received: from mail-pl1-f180.google.com ([209.85.214.180]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khVnH-0002uR-2N for kernel-team@lists.ubuntu.com; Tue, 24 Nov 2020 10:43:31 +0000 Received: by mail-pl1-f180.google.com with SMTP id t18so10510849plo.0 for ; Tue, 24 Nov 2020 02:43:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eEv/Z03pRHlUUleZlyPGCngFbwEN3izadlHdEUYy2kE=; b=cz4DGHAjjnQvK2FiVl8BVikdb9EtcWcdzUWxx2+2ZJIHSuAMtV5vSDBQ2+sYh/nacN zZT+rgzMG6SmcmsQBDZEj+ODecfkgRxizSCWfE7rO1ppsj+TEEQjO/riM3/Q5QKOmUzN mbdAsMnGlOlISoDUq7TlvYZOzipA54D/pqxKukmHopM0NTQua1+EjKuqOMrxeLQ8QWR4 mdBiG6w0EyzA6jbPxWpQQTGneZPcFvncQaK815rXOeAapSlvItqorpsbHTKLi7aN2DNe 9Fc6Xu/iugBhp7v5dQKVoYYQ0dDrThJiDYU8Mtj77eb1mTjypX+C8i4YHd1rGsFE+gvJ SsoA== X-Gm-Message-State: AOAM531Dqna/3YRIBVe/S4DoWNn6jNQeG+olEGPwD4aFOnd7O+f/DIja 036070ElYWj3O7xUNHXjmsdQYbaRoaToEA== X-Google-Smtp-Source: ABdhPJxadXsd1XHhbmlbU+VJZh2FTG5H6VH5h87anPgfBxapEWEw6QWCldTRqIl0gLTgk9JgKjzCkg== X-Received: by 2002:a17:902:26f:b029:d9:f9dc:e2db with SMTP id 102-20020a170902026fb02900d9f9dce2dbmr3500822plc.65.1606214608142; Tue, 24 Nov 2020 02:43:28 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id c191sm14613610pfc.166.2020.11.24.02.43.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 02:43:27 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 05/38][SRU][G/H] drm/i915: Fix ibx max vswing/preemph Date: Tue, 24 Nov 2020 18:42:40 +0800 Message-Id: <20201124104313.421860-6-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201124104313.421860-1-vicamo.yang@canonical.com> References: <20201124104313.421860-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.180; envelope-from=vicamo@gmail.com; helo=mail-pl1-f180.google.com 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" From: Ville Syrjälä BugLink: https://bugs.launchpad.net/bugs/1903969 IBX supports vswing level 3 and pre-emphasis level 3. Don't limit it to level 2 for those. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20200512174145.3186-3-ville.syrjala@linux.intel.com Reviewed-by: José Roberto de Souza (cherry picked from commit da882e6bb968b04195c32072376c4206f64037ef) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index b9ab951b6c28..00a63c6bc332 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3995,7 +3995,7 @@ intel_dp_voltage_max(struct intel_dp *intel_dp) if (HAS_DDI(dev_priv)) return intel_ddi_dp_voltage_max(encoder); else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) || - (HAS_PCH_CPT(dev_priv) && port != PORT_A)) + (HAS_PCH_SPLIT(dev_priv) && port != PORT_A)) return DP_TRAIN_VOLTAGE_SWING_LEVEL_3; else if (IS_IVYBRIDGE(dev_priv) && port == PORT_A) return DP_TRAIN_VOLTAGE_SWING_LEVEL_2; @@ -4013,7 +4013,7 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, u8 voltage_swing) if (HAS_DDI(dev_priv)) { return intel_ddi_dp_pre_emphasis_max(encoder, voltage_swing); } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) || - (HAS_PCH_CPT(dev_priv) && port != PORT_A)) { + (HAS_PCH_SPLIT(dev_priv) && port != PORT_A)) { switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) { case DP_TRAIN_VOLTAGE_SWING_LEVEL_0: return DP_TRAIN_PRE_EMPH_LEVEL_3;