Add Kabylake PCI IDs

Message ID	1447871982-8799-1-git-send-email-wayne.boyer@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Wayne Boyer <wayne.boyer@intel.com> To: intel-gfx@lists.freedesktop.org Date: Wed, 18 Nov 2015 10:39:42 -0800 Message-Id: <1447871982-8799-1-git-send-email-wayne.boyer@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Subject: [Intel-gfx] [PATCH] Add Kabylake PCI IDs Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

Message ID

1447871982-8799-1-git-send-email-wayne.boyer@intel.com (mailing list archive)

State

New, archived

Headers

From: Wayne Boyer <wayne.boyer@intel.com>
To: intel-gfx@lists.freedesktop.org
Date: Wed, 18 Nov 2015 10:39:42 -0800
Message-Id: <1447871982-8799-1-git-send-email-wayne.boyer@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-gfx] [PATCH] Add Kabylake PCI IDs
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

Commit Message

Wayne Boyer Nov. 18, 2015, 6:39 p.m. UTC

Add the Kabylake PCI IDs based on the following patches.

commit d97044b661d0d56b2a2ae9b2b95ab0b359b417dc
Author: Deepak S <deepak.s@intel.com>
Date:   Wed Oct 28 12:19:51 2015 -0700

    drm/i915/kbl: Add Kabylake PCI ID

commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d
Author: Deepak S <deepak.s@intel.com>
Date:   Wed Oct 28 12:21:12 2015 -0700

    drm/i915/kbl: Add Kabylake GT4 PCI ID

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
---
 src/i915_pciids.h  | 36 ++++++++++++++++++++++++++++++++++++
 src/intel_module.c |  6 ++++++
 2 files changed, 42 insertions(+)

Comments

Chris Wilson Nov. 19, 2015, 10:44 a.m. UTC | #1

On Wed, Nov 18, 2015 at 10:39:42AM -0800, Wayne Boyer wrote:
> Add the Kabylake PCI IDs based on the following patches.
> 
> commit d97044b661d0d56b2a2ae9b2b95ab0b359b417dc
> Author: Deepak S <deepak.s@intel.com>
> Date:   Wed Oct 28 12:19:51 2015 -0700
> 
>     drm/i915/kbl: Add Kabylake PCI ID
> 
> commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d
> Author: Deepak S <deepak.s@intel.com>
> Date:   Wed Oct 28 12:21:12 2015 -0700
> 
>     drm/i915/kbl: Add Kabylake GT4 PCI ID
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
> ---
>  src/i915_pciids.h  | 36 ++++++++++++++++++++++++++++++++++++
>  src/intel_module.c |  6 ++++++
>  2 files changed, 42 insertions(+)
> 
> diff --git a/src/i915_pciids.h b/src/i915_pciids.h
> index 17c4456..6374f58 100644
> --- a/src/i915_pciids.h
> +++ b/src/i915_pciids.h
> @@ -291,4 +291,40 @@
>  	INTEL_VGA_DEVICE(0x1A84, info), \
>  	INTEL_VGA_DEVICE(0x5A84, info)
>  
> +#define INTEL_KBL_GT1_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
> +	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
> +	INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
> +	INTEL_VGA_DEVICE(0x590B, info), /* HALO GT1 */ \
> +	INTEL_VGA_DEVICE(0x590A, info)  /* SRV GT1 */
> +
> +#define INTEL_KBL_GT2_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> +	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
> +	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
> +	INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
> +	INTEL_VGA_DEVICE(0x591B, info), /* HALO GT2 */ \
> +	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> +	INTEL_VGA_DEVICE(0x591D, info)  /* WKS GT2 */
> +
> +#define INTEL_KBL_GT3_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
> +	INTEL_VGA_DEVICE(0x592B, info), /* HALO GT3 */ \
> +	INTEL_VGA_DEVICE(0x592A, info)  /* SRV GT3 */
> +
> +#define INTEL_KBL_GT4_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \
> +	INTEL_VGA_DEVICE(0x593B, info), /* HALO GT4 */ \
> +	INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \
> +	INTEL_VGA_DEVICE(0x593D, info)  /* WKS GT4 */
> +
> +#define INTEL_KBL_IDS(info) \
> +	INTEL_KBL_GT1_IDS(info), \
> +	INTEL_KBL_GT2_IDS(info), \
> +	INTEL_KBL_GT3_IDS(info), \
> +	INTEL_KBL_GT4_IDS(info)

This is not an exact copy of the kernel i915_pciids.h
Urm?
-Chris

Chris Wilson Nov. 19, 2015, 11:44 a.m. UTC | #2

On Thu, Nov 19, 2015 at 10:44:51AM +0000, Chris Wilson wrote:
> On Wed, Nov 18, 2015 at 10:39:42AM -0800, Wayne Boyer wrote:
> > Add the Kabylake PCI IDs based on the following patches.
> > 
> > commit d97044b661d0d56b2a2ae9b2b95ab0b359b417dc
> > Author: Deepak S <deepak.s@intel.com>
> > Date:   Wed Oct 28 12:19:51 2015 -0700
> > 
> >     drm/i915/kbl: Add Kabylake PCI ID
> > 
> > commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d
> > Author: Deepak S <deepak.s@intel.com>
> > Date:   Wed Oct 28 12:21:12 2015 -0700
> > 
> >     drm/i915/kbl: Add Kabylake GT4 PCI ID
> > 
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
> > ---
> >  src/i915_pciids.h  | 36 ++++++++++++++++++++++++++++++++++++
> >  src/intel_module.c |  6 ++++++
> >  2 files changed, 42 insertions(+)
> > 
> > diff --git a/src/i915_pciids.h b/src/i915_pciids.h
> > index 17c4456..6374f58 100644
> > --- a/src/i915_pciids.h
> > +++ b/src/i915_pciids.h
> > @@ -291,4 +291,40 @@
> >  	INTEL_VGA_DEVICE(0x1A84, info), \
> >  	INTEL_VGA_DEVICE(0x5A84, info)
> >  
> > +#define INTEL_KBL_GT1_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
> > +	INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
> > +	INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
> > +	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
> > +	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
> > +	INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
> > +	INTEL_VGA_DEVICE(0x590B, info), /* HALO GT1 */ \
> > +	INTEL_VGA_DEVICE(0x590A, info)  /* SRV GT1 */
> > +
> > +#define INTEL_KBL_GT2_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> > +	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
> > +	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
> > +	INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
> > +	INTEL_VGA_DEVICE(0x591B, info), /* HALO GT2 */ \
> > +	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> > +	INTEL_VGA_DEVICE(0x591D, info)  /* WKS GT2 */
> > +
> > +#define INTEL_KBL_GT3_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
> > +	INTEL_VGA_DEVICE(0x592B, info), /* HALO GT3 */ \
> > +	INTEL_VGA_DEVICE(0x592A, info)  /* SRV GT3 */
> > +
> > +#define INTEL_KBL_GT4_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \
> > +	INTEL_VGA_DEVICE(0x593B, info), /* HALO GT4 */ \
> > +	INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \
> > +	INTEL_VGA_DEVICE(0x593D, info)  /* WKS GT4 */
> > +
> > +#define INTEL_KBL_IDS(info) \
> > +	INTEL_KBL_GT1_IDS(info), \
> > +	INTEL_KBL_GT2_IDS(info), \
> > +	INTEL_KBL_GT3_IDS(info), \
> > +	INTEL_KBL_GT4_IDS(info)
> 
> This is not an exact copy of the kernel i915_pciids.h

I copied across i915_pciids.h and pushed. 
-Chris

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 17c4456..6374f58 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -291,4 +291,40 @@ 
 	INTEL_VGA_DEVICE(0x1A84, info), \
 	INTEL_VGA_DEVICE(0x5A84, info)
 
+#define INTEL_KBL_GT1_IDS(info) \
+	INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
+	INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
+	INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
+	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
+	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
+	INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
+	INTEL_VGA_DEVICE(0x590B, info), /* HALO GT1 */ \
+	INTEL_VGA_DEVICE(0x590A, info)  /* SRV GT1 */
+
+#define INTEL_KBL_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
+	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
+	INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
+	INTEL_VGA_DEVICE(0x591B, info), /* HALO GT2 */ \
+	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
+	INTEL_VGA_DEVICE(0x591D, info)  /* WKS GT2 */
+
+#define INTEL_KBL_GT3_IDS(info) \
+	INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x592B, info), /* HALO GT3 */ \
+	INTEL_VGA_DEVICE(0x592A, info)  /* SRV GT3 */
+
+#define INTEL_KBL_GT4_IDS(info) \
+	INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \
+	INTEL_VGA_DEVICE(0x593B, info), /* HALO GT4 */ \
+	INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \
+	INTEL_VGA_DEVICE(0x593D, info)  /* WKS GT4 */
+
+#define INTEL_KBL_IDS(info) \
+	INTEL_KBL_GT1_IDS(info), \
+	INTEL_KBL_GT2_IDS(info), \
+	INTEL_KBL_GT3_IDS(info), \
+	INTEL_KBL_GT4_IDS(info)
+
 #endif /* _I915_PCIIDS_H */
diff --git a/src/intel_module.c b/src/intel_module.c
index d3dca83..60835b9 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -130,6 +130,10 @@  static const struct intel_device_info intel_broxton_info = {
 	.gen = 0111,
 };
 
+static const struct intel_device_info intel_kabylake_info = {
+	.gen = 0112,
+};
+
 static const SymTabRec intel_chipsets[] = {
 	{PCI_CHIP_I810,				"i810"},
 	{PCI_CHIP_I810_DC100,			"i810-dc100"},
@@ -329,6 +333,8 @@  static const struct pci_id_match intel_device_match[] = {
 
 	INTEL_BXT_IDS(&intel_broxton_info),
 
+	INTEL_KBL_IDS(&intel_kabylake_info),
+
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 #endif

Add Kabylake PCI IDs

Commit Message

Comments

Patch