From e918d79a5d0a1b431e2cac0e6e6ac9452fd9ab32 Mon Sep 17 00:00:00 2001

From: Rodrigo Vivi <rodrigo.vivi@intel.com>

Date: Tue, 6 Jun 2017 13:30:32 -0700

Subject: [PATCH] drm/i915/cnl: Add Cannonlake PCI IDs for U-skus.

Git-commit: e918d79a5d0a1b431e2cac0e6e6ac9452fd9ab32

Patch-mainline: v4.13-rc1

References: FATE#322643 bsc#1055900

Platform enabling and its power-on are organized in different

skus (U x Y x S x H, etc). So instead of organizing it in

GT1 x GT2 x GT3 let's also use the platform sku.

This is also the new Spec style what makes the review much

more easy and straightforward.

V2: Really include the PCI IDs to the picidlist[];

V3: Remove PCI IDs not present in spec.

V4: Rebase.

Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com>

Link: http://patchwork.freedesktop.org/patch/msgid/1496781040-20888-3-git-send-email-rodrigo.vivi@intel.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/i915/i915_pci.c |    1 +

 include/drm/i915_pciids.h       |   10 ++++++++++

 2 files changed, 11 insertions(+)

--- a/drivers/gpu/drm/i915/i915_pci.c

+++ b/drivers/gpu/drm/i915/i915_pci.c

@@ -477,6 +477,7 @@ static const struct pci_device_id pciidl

 	INTEL_KBL_GT2_IDS(&intel_kabylake_info),

 	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),

 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),

+	INTEL_CNL_IDS(&intel_cannonlake_info),

 	{0, 0, 0}

 };

 MODULE_DEVICE_TABLE(pci, pciidlist);

--- a/include/drm/i915_pciids.h

+++ b/include/drm/i915_pciids.h

@@ -334,4 +334,14 @@

 	INTEL_KBL_GT3_IDS(info), \

 	INTEL_KBL_GT4_IDS(info)

+/* CNL U 2+2 */

+#define INTEL_CNL_U_GT2_IDS(info) \

+	INTEL_VGA_DEVICE(0x5A52, info), \

+	INTEL_VGA_DEVICE(0x5A5A, info), \

+	INTEL_VGA_DEVICE(0x5A42, info), \

+	INTEL_VGA_DEVICE(0x5A4A, info)

+

+#define INTEL_CNL_IDS(info) \

+	INTEL_CNL_U_GT2_IDS(info)

+

 #endif /* _I915_PCIIDS_H */