From patchwork Wed Nov 13 11:14:20 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: 1194211 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 47ChpT13wzz9sPZ; Wed, 13 Nov 2019 22:14:41 +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 1iUqbd-0003zZ-3R; Wed, 13 Nov 2019 11:14:37 +0000 Received: from mail-pg1-f182.google.com ([209.85.215.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iUqbb-0003xQ-Bw for kernel-team@lists.ubuntu.com; Wed, 13 Nov 2019 11:14:35 +0000 Received: by mail-pg1-f182.google.com with SMTP id w11so1166703pga.12 for ; Wed, 13 Nov 2019 03:14:35 -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=h78vDKvz/rIu4oHqh0MAL9Hb19s9ZTDIVhKp+YWqGJI=; b=o+Z66BdnOWTa1t5wkqQ5zc7z0LJA/kfmikIurE6NlUYrYbN9HZiJeErKO5END00A33 3/CfJ8TIKTJp1iSbw6StrVSICYB7uOujrxFYY6Q4EEkJFGo4pw5VEGAnYUSDoTqsL+f8 /m/erRani33REGm3OiTMSd+fs9k9CSR7ZfmBXeCKrzbtZwFnImF7FE4vTnRkWQdSEGJ9 XYSMKRzoa9/9oiLRyrrG6Kams3P1n93+M7U9eypwtn2RJ9w9af+c/hdpXasFCrlj0rUv 7gs2jhTy7UIa6IUrVECVcaYYhoe0CA3IGeuqr4+GnO0165lsxey0plFGDUXR2YvRcODi 2klg== X-Gm-Message-State: APjAAAVWwnV2qWIZllZ0kb0eIbKjMqCsViQXCDXF2ieVo0HkAFwj8VFb L7GMOZENf6lSTBpdER0fEjAjmwcO X-Google-Smtp-Source: APXvYqzbNpXMcq5lptCnB4unksCtpqnKdnEHwDj0YmGKYrZx80VeY/YyhuPNf2BwtGz+xY1AklMrdA== X-Received: by 2002:a17:90a:9b87:: with SMTP id g7mr4132236pjp.64.1573643673372; Wed, 13 Nov 2019 03:14:33 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id v24sm2374572pfn.53.2019.11.13.03.14.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 03:14:32 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][U][PATCH 1/2] drm/i915: Add new CNL PCH ID seen on a CML platform Date: Wed, 13 Nov 2019 19:14:20 +0800 Message-Id: <20191113111421.744140-4-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 (cherry picked from commit 37c92dc303dd0977134d1c8501f057de407473ec https://anongit.freedesktop.org/git/drm-tip.git) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/intel_pch.c | 1 + drivers/gpu/drm/i915/intel_pch.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c index 15f8bff141f91..5cdf36aa95add 100644 --- a/drivers/gpu/drm/i915/intel_pch.c +++ b/drivers/gpu/drm/i915/intel_pch.c @@ -61,6 +61,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/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h index c29c81ec7971c..453c76f95e7ff 100644 --- a/drivers/gpu/drm/i915/intel_pch.h +++ b/drivers/gpu/drm/i915/intel_pch.h @@ -39,6 +39,7 @@ enum intel_pch { #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_CMP2_DEVICE_ID_TYPE 0x0680