From patchwork Fri Dec 29 08:23:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liwei Song X-Patchwork-Id: 10137037 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 9341660318 for ; Fri, 29 Dec 2017 12:07:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80DDC2DF32 for ; Fri, 29 Dec 2017 12:07:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75C7F2DF3D; Fri, 29 Dec 2017 12:07:34 +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=-4.2 required=2.0 tests=BAYES_00, 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 7AFAF2DF32 for ; Fri, 29 Dec 2017 12:07:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 45A1D897D7; Fri, 29 Dec 2017 12:07:32 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 13436 seconds by postgrey-1.35 at gabe; Fri, 29 Dec 2017 12:07:31 UTC Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FA29897D7 for ; Fri, 29 Dec 2017 12:07:30 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id vBT8NQku012252 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 29 Dec 2017 00:23:26 -0800 (PST) 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.361.1; Fri, 29 Dec 2017 00:23:20 -0800 From: Song liwei To: Chris Wilson Date: Fri, 29 Dec 2017 03:23:17 -0500 Message-ID: <1514535797-23673-1-git-send-email-liwei.song@windriver.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH xf86-video-intel] Add Coffeelake PCI IDs for S Skus X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Liwei Song Add the Coffeelake PCI IDs based on the following kernel patches: commit b056f8f3d6b900e8afd19f312719160346d263b4 Author: Anusha Srivatsa Date: Thu Jun 8 16:41:05 2017 -0700 drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. Signed-off-by: Liwei Song --- src/i915_pciids.h | 7 +++++++ src/intel_module.c | 13 +++++++++++++ src/sna/gen9_render.c | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/i915_pciids.h b/src/i915_pciids.h index 466c71592a6f..77b200f4a844 100644 --- a/src/i915_pciids.h +++ b/src/i915_pciids.h @@ -326,4 +326,11 @@ INTEL_KBL_GT3_IDS(info), \ INTEL_KBL_GT4_IDS(info) +#define INTEL_CFL_S_IDS(info) \ + INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ + INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ + INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ + #endif /* _I915_PCIIDS_H */ diff --git a/src/intel_module.c b/src/intel_module.c index 2e97b5ea2d05..ffbd1923d688 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = { .gen = 0113, }; +static const struct intel_device_info intel_coffeelake_info = { + .gen = 0114, +}; + static const SymTabRec intel_chipsets[] = { {PCI_CHIP_I810, "i810"}, {PCI_CHIP_I810_DC100, "i810-dc100"}, @@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = { {0x5916, "HD Graphics 620"}, {0x591E, "HD Graphics 615"}, + /*Coffeelake*/ + {0x3E90, "HD Graphics"}, + {0x3E93, "HD Graphics"}, + {0x3E91, "HD Graphics"}, + {0x3E92, "HD Graphics"}, + {0x3E96, "HD Graphics"}, + /* When adding new identifiers, also update: * 1. intel_identify() * 2. man/intel.man @@ -358,6 +369,8 @@ 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_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), #endif diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c index 68ac14383a5b..9767e1074f82 100644 --- a/src/sna/gen9_render.c +++ b/src/sna/gen9_render.c @@ -253,6 +253,11 @@ static const struct gt_info glk_gt_info = { .urb = { .max_vs_entries = 320 }, }; +static const struct gt_info cfl_gt_info = { + .name = "Coffeelake (gen9)", + .urb = { .max_vs_entries = 960 }, +}; + static bool is_skl(struct sna *sna) { return sna->kgem.gen == 0110; @@ -273,6 +278,11 @@ static bool is_glk(struct sna *sna) return sna->kgem.gen == 0113; } +static bool is_cfl(struct sna *sna) +{ + return sna->kgem.gen == 0114; +} + static inline bool too_large(int width, int height) { @@ -4056,6 +4066,8 @@ static bool gen9_render_setup(struct sna *sna) state->info = &kbl_gt_info; if (is_glk(sna)) state->info = &glk_gt_info; + if (is_cfl(sna)) + state->info = &cfl_gt_info; sna_static_stream_init(&general);