From patchwork Wed Nov 13 11:14:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1194209 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 47ChpL26cyz9sNH; Wed, 13 Nov 2019 22:14:34 +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 1iUqbW-0003ux-Jn; Wed, 13 Nov 2019 11:14:30 +0000 Received: from mail-pg1-f175.google.com ([209.85.215.175]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iUqbU-0003tc-P6 for kernel-team@lists.ubuntu.com; Wed, 13 Nov 2019 11:14:28 +0000 Received: by mail-pg1-f175.google.com with SMTP id q22so1198716pgk.2 for ; Wed, 13 Nov 2019 03:14:28 -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=L06H601HhyKd6BYpDW6x+1+RJRaRl3/S+6JYR5TYhws=; b=bd+AJ+n4UfuSRo0PJu/Lg/Fw1tI9BHtO5IW70Fj29GkMMZ+PIp42tT6lTuy+zEEQzv llGI3xBbepoNjW3fvcG+mCJAILMH50He8L3VmiYyIOvBFx1/fhEva9iAHif7e+Z6uEWP ow4qzmf6f8b0DAJDZ3znfTgk252iAjCTe6tJyeZ71WpJtwcPnd7isQNGlftk+dQZK3Tv c963f7hvgpHppHI72D2Fcz8W6aaKaos62NgUnrj52BvFFAg2kQMFrHamnBhHus0O1TAW 7iFc8kuZUVZa347ofcshEJDj5g3Fu7RfH1xKL7OShi0pHfpNoECFZz6LyeMeQE+4PQQl JmvQ== X-Gm-Message-State: APjAAAUVpQICFXPZjgICL+YrEK0euG1oGvWLHBiSfMqv7H7gJbYjHV4f wHei3akoJqKt7K63nV/gqbM80E9z X-Google-Smtp-Source: APXvYqyiOqolL+he1TTTwlBEWI1P2PBKpwhqezLK9TbNvl4l0lJAe+epw8D84XBQ+ttSXaOm0B7zFQ== X-Received: by 2002:a63:588:: with SMTP id 130mr3152304pgf.148.1573643666605; Wed, 13 Nov 2019 03:14:26 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id d4sm2374909pjs.9.2019.11.13.03.14.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 03:14:25 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][E/F][PATCH 1/2] drm/i915: Add new CNL PCH ID seen on a CML platform Date: Wed, 13 Nov 2019 19:14:18 +0800 Message-Id: <20191113111421.744140-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113111421.744140-1-vicamo.yang@canonical.com> References: <20191113111421.744140-1-vicamo.yang@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" From: Imre Deak BugLink: https://bugs.launchpad.net/bugs/1852386 Atm we don't detect a PCH with PCI ID 0xA3C1 which showed up now on a CML platform. We don't have the official assignment of the PCH PCI IDs, but this looks like a CNP which was already used on CML platforms. Let's add the new ID->PCH type mapping accordingly. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051 Reported-and-tested-by: Cyrus Cc: Cyrus Signed-off-by: Imre Deak Reviewed-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20191022095155.30991-1-imre.deak@intel.com (backported from commit 37c92dc303dd0977134d1c8501f057de407473ec https://anongit.freedesktop.org/git/drm-tip.git) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 377e8fe6fe1a2..b2ac3b666fb8c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -202,6 +202,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) /* KBP is SPT compatible */ return PCH_SPT; case INTEL_PCH_CNP_DEVICE_ID_TYPE: + case INTEL_PCH_CNP2_DEVICE_ID_TYPE: DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); return PCH_CNP; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 3f8461a2315d5..cbfa3054f5b0a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2373,6 +2373,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE 0x9D00 #define INTEL_PCH_KBP_DEVICE_ID_TYPE 0xA280 #define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300 +#define INTEL_PCH_CNP2_DEVICE_ID_TYPE 0xA380 #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80 #define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280 #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480 From patchwork Wed Nov 13 11:14:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1194210 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 47ChpQ3zLYz9sNx; Wed, 13 Nov 2019 22:14:38 +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 1iUqba-0003xg-SR; Wed, 13 Nov 2019 11:14:34 +0000 Received: from mail-pg1-f194.google.com ([209.85.215.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iUqbY-0003w9-OW for kernel-team@lists.ubuntu.com; Wed, 13 Nov 2019 11:14:32 +0000 Received: by mail-pg1-f194.google.com with SMTP id 15so1183184pgt.7 for ; Wed, 13 Nov 2019 03:14:32 -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=Dj5oL/FR50kM0DF8Il3HkuQYYQDhxiuYfzMFUTWIdy0=; b=jpwajHyxizOGwCGj4SigGm2pqbNv0pBeY04Hp2FMDS3UL+MM/Q8LPqdTKCUkZ8PeN2 QAZKb1MZhLe6IIi/cNK5rvD6VoTaIVo+xw9dxKwZi/5+jnTa2LapJ3HtMGcdL/frZTb+ 5I+ot5RepmF9LaXrj7QOvZzrn61N1mIihy77CTkyyzLzcEV6uOkgnBOfpWNTabFbtGa0 OdCTwhEJH9/+Rf2zjA2a9+XkkaWoz7sThFe4SkzluUDyIN5Z933COpzFOAV8lkok7ymg mQI3tqyOQ7LGkXQOA4k86bEhT8fjJtmW535AYBR9efyGHAvb39jACDWYpayq6psFXUky 30NA== X-Gm-Message-State: APjAAAXGCnbG9sfZ/GO6Deryk40ImqsvwHADQafxWYARGBAGbs39s5fy 0ygzUj5/oqjzgQ8kpgOJvfHiZRR/ X-Google-Smtp-Source: APXvYqzLk+vIkF4Ex46hyGytcn40sU9Ajl8rqZAY7APYabJOCySo/vQ5N7eXxAL90QaXUK+aES9MwA== X-Received: by 2002:a62:168f:: with SMTP id 137mr3785215pfw.151.1573643670613; Wed, 13 Nov 2019 03:14:30 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id y36sm2027107pgk.66.2019.11.13.03.14.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 03:14:29 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][E/F][PATCH 2/2] UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH Date: Wed, 13 Nov 2019 19:14:19 +0800 Message-Id: <20191113111421.744140-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113111421.744140-1-vicamo.yang@canonical.com> References: <20191113111421.744140-1-vicamo.yang@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" From: Imre Deak BugLink: https://bugs.launchpad.net/bugs/1852386 According to internal documents I found for CMP PCHs the PCI ID 0xA3C1 belongs to a CMP-V chipset. Based on the same docs the programming of the PCH is compatible with that of KBP. Fix up my previous wrong assumption accordingly using the SPT programming which in turn is the basis for KBP. The original bug reporter verified that this is the correct PCH identification (the only way we'll program valid DDC pin-pair values to the GMBUS register) and the Windows team uses the same identification (that is using the KBP programming model for this PCH). I filed the necessary Bspec update requests (BSpec/33734). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051 Fixes: 37c92dc303dd ("drm/i915: Add new CNL PCH ID seen on a CML platform") Reported-and-tested-by: Cyrus Cc: Cyrus Cc: Timo Aaltonen Cc: José Roberto de Souza Signed-off-by: Imre Deak Reviewed-by: José Roberto de Souza (backported from https://patchwork.freedesktop.org/patch/340416) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/i915_drv.c | 6 +++++- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index b2ac3b666fb8c..fe931ac4617ac 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -202,7 +202,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) /* KBP is SPT compatible */ return PCH_SPT; case INTEL_PCH_CNP_DEVICE_ID_TYPE: - case INTEL_PCH_CNP2_DEVICE_ID_TYPE: DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); return PCH_CNP; @@ -215,6 +214,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) WARN_ON(!IS_COFFEELAKE(dev_priv)); /* CometPoint is CNP Compatible */ return PCH_CNP; + case INTEL_PCH_CMP_V_DEVICE_ID_TYPE: + DRM_DEBUG_KMS("Found Comet Lake V PCH (CMP-V)\n"); + WARN_ON(!IS_COFFEELAKE(dev_priv)); + /* Comet Lake V PCH is based on KBP, which is SPT compatible */ + return PCH_SPT; case INTEL_PCH_ICP_DEVICE_ID_TYPE: DRM_DEBUG_KMS("Found Ice Lake PCH\n"); WARN_ON(!IS_ICELAKE(dev_priv)); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cbfa3054f5b0a..64b2d4e5ca002 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2373,9 +2373,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE 0x9D00 #define INTEL_PCH_KBP_DEVICE_ID_TYPE 0xA280 #define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300 -#define INTEL_PCH_CNP2_DEVICE_ID_TYPE 0xA380 #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80 #define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280 +#define INTEL_PCH_CMP_V_DEVICE_ID_TYPE 0xA380 #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480 #define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00 #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100