From patchwork Tue Dec 20 12:33:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ander Conselvan de Oliveira X-Patchwork-Id: 9481491 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 70A79606DB for ; Tue, 20 Dec 2016 12:34:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62FED28483 for ; Tue, 20 Dec 2016 12:34:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57D50284B0; Tue, 20 Dec 2016 12:34:07 +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 B633F28483 for ; Tue, 20 Dec 2016 12:34:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B011A6E97E; Tue, 20 Dec 2016 12:34:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0E2F6E97E for ; Tue, 20 Dec 2016 12:33:59 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP; 20 Dec 2016 04:33:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,378,1477983600"; d="scan'208";a="204916653" Received: from linux.intel.com ([10.54.29.200]) by fmsmga004.fm.intel.com with ESMTP; 20 Dec 2016 04:33:58 -0800 Received: from localhost (aconselv-mobl3.fi.intel.com [10.237.72.203]) by linux.intel.com (Postfix) with ESMTP id 6628D6A4006; Tue, 20 Dec 2016 04:33:09 -0800 (PST) From: Ander Conselvan de Oliveira To: intel-gfx@lists.freedesktop.org Date: Tue, 20 Dec 2016 14:33:50 +0200 Message-Id: <1482237231-31597-1-git-send-email-ander.conselvan.de.oliveira@intel.com> X-Mailer: git-send-email 2.5.5 Cc: Ander Conselvan de Oliveira Subject: [Intel-gfx] [PATCH i-g-t 1/2] lib/i915_pciids.h: Update to latest version wich includes GLK ids 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Copy the include/drm/i915_pciids.h file from following kernel commit, which includes Geminilake PCI IDs. commit 8363e3c3947d0e22955f94a6a87e4f17ce5087b4 Author: Ander Conselvan de Oliveira Date: Thu Nov 10 17:23:08 2016 +0200 drm/i915/glk: Add Geminilake PCI IDs Signed-off-by: Ander Conselvan de Oliveira Reviewed-by: Petri Latvala --- lib/i915_pciids.h | 42 ++++++++++++++++++------------------------ lib/intel_device_info.c | 27 +++------------------------ overlay/igfx.c | 9 +++------ tests/gen7_forcewake_mt.c | 3 +-- 4 files changed, 25 insertions(+), 56 deletions(-) diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index 33466bf..540be9f 100644 --- a/lib/i915_pciids.h +++ b/lib/i915_pciids.h @@ -134,7 +134,7 @@ #define INTEL_IVB_Q_IDS(info) \ INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */ -#define INTEL_HSW_D_IDS(info) \ +#define INTEL_HSW_IDS(info) \ INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \ INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \ INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \ @@ -179,9 +179,7 @@ INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \ INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \ INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \ - INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */ \ - -#define INTEL_HSW_M_IDS(info) \ + INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \ INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \ INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \ INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \ @@ -198,17 +196,15 @@ INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \ INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */ -#define INTEL_VLV_M_IDS(info) \ +#define INTEL_VLV_IDS(info) \ INTEL_VGA_DEVICE(0x0f30, info), \ INTEL_VGA_DEVICE(0x0f31, info), \ INTEL_VGA_DEVICE(0x0f32, info), \ INTEL_VGA_DEVICE(0x0f33, info), \ - INTEL_VGA_DEVICE(0x0157, info) - -#define INTEL_VLV_D_IDS(info) \ + INTEL_VGA_DEVICE(0x0157, info), \ INTEL_VGA_DEVICE(0x0155, info) -#define INTEL_BDW_GT12M_IDS(info) \ +#define INTEL_BDW_GT12_IDS(info) \ INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \ INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \ INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \ @@ -216,21 +212,17 @@ INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \ INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \ INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \ - INTEL_VGA_DEVICE(0x161E, info) /* GT2 ULX */ - -#define INTEL_BDW_GT12D_IDS(info) \ + INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \ INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \ INTEL_VGA_DEVICE(0x160D, info), /* GT1 Workstation */ \ INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \ INTEL_VGA_DEVICE(0x161D, info) /* GT2 Workstation */ -#define INTEL_BDW_GT3M_IDS(info) \ +#define INTEL_BDW_GT3_IDS(info) \ INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \ INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \ INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \ - INTEL_VGA_DEVICE(0x162E, info) /* ULX */ - -#define INTEL_BDW_GT3D_IDS(info) \ + INTEL_VGA_DEVICE(0x162E, info), /* ULX */\ INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ @@ -244,14 +236,12 @@ INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ -#define INTEL_BDW_M_IDS(info) \ - INTEL_BDW_GT12M_IDS(info), \ - INTEL_BDW_GT3M_IDS(info), \ - INTEL_BDW_RSVDM_IDS(info) - -#define INTEL_BDW_D_IDS(info) \ - INTEL_BDW_GT12D_IDS(info), \ - INTEL_BDW_GT3D_IDS(info), \ +#define INTEL_BDW_IDS(info) \ + INTEL_BDW_GT12_IDS(info), \ + INTEL_BDW_GT3_IDS(info), \ + INTEL_BDW_RSVDM_IDS(info), \ + INTEL_BDW_GT12_IDS(info), \ + INTEL_BDW_GT3_IDS(info), \ INTEL_BDW_RSVDD_IDS(info) #define INTEL_CHV_IDS(info) \ @@ -302,6 +292,10 @@ INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \ INTEL_VGA_DEVICE(0x5A85, info) /* APL HD Graphics 500 */ +#define INTEL_GLK_IDS(info) \ + INTEL_VGA_DEVICE(0x3184, info), \ + INTEL_VGA_DEVICE(0x3185, info) + #define INTEL_KBL_GT1_IDS(info) \ INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index 5aab684..5805b5e 100644 --- a/lib/intel_device_info.c +++ b/lib/intel_device_info.c @@ -138,36 +138,18 @@ static const struct intel_device_info intel_valleyview_info = { .is_valleyview = true, .codename = "valleyview" }; -static const struct intel_device_info intel_valleyview_m_info = { - .gen = BIT(6), - .is_mobile = true, - .is_valleyview = true, - .codename = "valleyview" -}; static const struct intel_device_info intel_haswell_info = { .gen = BIT(6), .is_haswell = true, .codename = "haswell" }; -static const struct intel_device_info intel_haswell_m_info = { - .gen = BIT(6), - .is_mobile = true, - .is_haswell = true, - .codename = "haswell" -}; static const struct intel_device_info intel_broadwell_info = { .gen = BIT(7), .is_broadwell = true, .codename = "broadwell" }; -static const struct intel_device_info intel_broadwell_m_info = { - .gen = BIT(7), - .is_mobile = true, - .is_broadwell = true, - .codename = "broadwell" -}; static const struct intel_device_info intel_cherryview_info = { .gen = BIT(7), @@ -222,14 +204,11 @@ static const struct pci_id_match intel_device_match[] = { INTEL_IVB_D_IDS(&intel_ivybridge_info), INTEL_IVB_M_IDS(&intel_ivybridge_m_info), - INTEL_HSW_D_IDS(&intel_haswell_info), - INTEL_HSW_M_IDS(&intel_haswell_m_info), + INTEL_HSW_IDS(&intel_haswell_info), - INTEL_VLV_D_IDS(&intel_valleyview_info), - INTEL_VLV_M_IDS(&intel_valleyview_m_info), + INTEL_VLV_IDS(&intel_valleyview_info), - INTEL_BDW_D_IDS(&intel_broadwell_info), - INTEL_BDW_M_IDS(&intel_broadwell_m_info), + INTEL_BDW_IDS(&intel_broadwell_info), INTEL_CHV_IDS(&intel_cherryview_info), diff --git a/overlay/igfx.c b/overlay/igfx.c index 4a9181c..6d82bc8 100644 --- a/overlay/igfx.c +++ b/overlay/igfx.c @@ -145,14 +145,11 @@ static const struct pci_id_match match[] = { INTEL_IVB_D_IDS(&ivybridge_info), INTEL_IVB_M_IDS(&ivybridge_info), - INTEL_HSW_D_IDS(&haswell_info), - INTEL_HSW_M_IDS(&haswell_info), + INTEL_HSW_IDS(&haswell_info), - INTEL_VLV_D_IDS(&valleyview_info), - INTEL_VLV_M_IDS(&valleyview_info), + INTEL_VLV_IDS(&valleyview_info), - INTEL_BDW_D_IDS(&broadwell_info), - INTEL_BDW_M_IDS(&broadwell_info), + INTEL_BDW_IDS(&broadwell_info), INTEL_CHV_IDS(&cherryview_info), diff --git a/tests/gen7_forcewake_mt.c b/tests/gen7_forcewake_mt.c index dea1e8a..07320ef 100644 --- a/tests/gen7_forcewake_mt.c +++ b/tests/gen7_forcewake_mt.c @@ -53,8 +53,7 @@ static const struct pci_id_match match[] = { INTEL_IVB_D_IDS(NULL), INTEL_IVB_M_IDS(NULL), - INTEL_HSW_D_IDS(NULL), - INTEL_HSW_M_IDS(NULL), + INTEL_HSW_IDS(NULL), { 0, 0, 0 }, };