From patchwork Fri Jun 29 08:37:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liwei Song X-Patchwork-Id: 10496189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 110C36022E for ; Fri, 29 Jun 2018 11:11:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA90F2903B for ; Fri, 29 Jun 2018 11:11:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD67A2920E; Fri, 29 Jun 2018 11:11:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DFCB2903B for ; Fri, 29 Jun 2018 11:11:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C560B6EF88; Fri, 29 Jun 2018 11:11:30 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 9189 seconds by postgrey-1.36 at gabe; Fri, 29 Jun 2018 11:11:28 UTC Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3B2A6EF88 for ; Fri, 29 Jun 2018 11:11:28 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com ([147.11.189.41]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id w5T8cCel016005 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 29 Jun 2018 01:38:12 -0700 (PDT) Received: from pek-lpggp3.wrs.com (128.224.153.76) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.399.0; Fri, 29 Jun 2018 01:38:11 -0700 From: Liwei Song To: Chris Date: Fri, 29 Jun 2018 04:37:57 -0400 Message-ID: <1530261477-66755-1-git-send-email-liwei.song@windriver.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH xf86-video-intel] Adding more Coffee Lake PCI IDs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Add more Coffeelake PCI IDs based on the following kernel patch: commit c99d7832dcd7423ba352386107118b9bd8b83158 Author: Rodrigo Vivi Date: Wed Dec 20 10:29:19 2017 -0800 drm/i915/cfl: Adding more Coffee Lake PCI IDs. Signed-off-by: Liwei Song --- src/i915_pciids.h | 37 +++++++++++++++++++++++++++++++------ src/intel_module.c | 12 +++++++++--- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/i915_pciids.h b/src/i915_pciids.h index aadd41522bc6..baf17383cfc7 100644 --- a/src/i915_pciids.h +++ b/src/i915_pciids.h @@ -326,21 +326,46 @@ INTEL_KBL_GT3_IDS(info), \ INTEL_KBL_GT4_IDS(info) -#define INTEL_CFL_S_IDS(info) \ +#define INTEL_CFL_S_GT1_IDS(info) \ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ + INTEL_VGA_DEVICE(0x3E99, info) /* SRV GT1 */ + +#define INTEL_CFL_S_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ - INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ + INTEL_VGA_DEVICE(0x3E96, info), /* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */ -#define INTEL_CFL_H_IDS(info) \ +#define INTEL_CFL_H_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \ INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */ -#define INTEL_CFL_U_IDS(info) \ +/* CFL U GT1 */ +#define INTEL_CFL_U_GT1_IDS(info) \ + INTEL_VGA_DEVICE(0x3EA1, info), \ + INTEL_VGA_DEVICE(0x3EA4, info) + +/* CFL U GT2 */ +#define INTEL_CFL_U_GT2_IDS(info) \ + INTEL_VGA_DEVICE(0x3EA0, info), \ + INTEL_VGA_DEVICE(0x3EA3, info), \ + INTEL_VGA_DEVICE(0x3EA9, info) + +/* CFL U GT3 */ +#define INTEL_CFL_U_GT3_IDS(info) \ + INTEL_VGA_DEVICE(0x3EA2, info), /* ULT GT3 */ \ + INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \ - INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \ - INTEL_VGA_DEVICE(0x3EA5, info) /* ULT GT3 */ + INTEL_VGA_DEVICE(0x3EA8, info) /* ULT GT3 */ \ + +#define INTEL_CFL_IDS(info) \ + INTEL_CFL_S_GT1_IDS(info), \ + INTEL_CFL_S_GT2_IDS(info), \ + INTEL_CFL_H_GT2_IDS(info), \ + INTEL_CFL_U_GT1_IDS(info), \ + INTEL_CFL_U_GT2_IDS(info), \ + INTEL_CFL_U_GT3_IDS(info) #endif /* _I915_PCIIDS_H */ diff --git a/src/intel_module.c b/src/intel_module.c index 3ecc27ea4fdf..a8c9768ee9f8 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -310,11 +310,19 @@ static const SymTabRec intel_chipsets[] = { /*Coffeelake*/ {0x3E90, "HD Graphics"}, {0x3E93, "HD Graphics"}, + {0x3E99, "HD Graphics"}, {0x3E91, "HD Graphics"}, {0x3E92, "HD Graphics"}, {0x3E96, "HD Graphics"}, + {0x3E9A, "HD Graphics"}, {0x3E9B, "HD Graphics"}, {0x3E94, "HD Graphics"}, + {0x3EA1, "HD Graphics"}, + {0x3EA4, "HD Graphics"}, + {0x3EA0, "HD Graphics"}, + {0x3EA3, "HD Graphics"}, + {0x3EA9, "HD Graphics"}, + {0x3EA2, "HD Graphics"}, {0x3EA5, "HD Graphics"}, {0x3EA6, "HD Graphics"}, {0x3EA7, "HD Graphics"}, @@ -375,9 +383,7 @@ static const struct pci_id_match intel_device_match[] = { INTEL_KBL_IDS(&intel_kabylake_info), INTEL_GLK_IDS(&intel_geminilake_info), - INTEL_CFL_S_IDS(&intel_coffeelake_info), - INTEL_CFL_H_IDS(&intel_coffeelake_info), - INTEL_CFL_U_IDS(&intel_coffeelake_info), + INTEL_CFL_IDS(&intel_coffeelake_info), INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), #endif