diff mbox

[2/3] drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.

Message ID 1496786917-13580-2-git-send-email-anusha.srivatsa@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Srivatsa, Anusha June 6, 2017, 10:08 p.m. UTC
Add PCI Ids for S Sku following the BSpec.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 include/drm/i915_pciids.h       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

kernel test robot June 7, 2017, 8:49 p.m. UTC | #1
Hi Anusha,

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.12-rc4 next-20170607]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/drm-i915-cfl-Add-Coffee-Lake-PCI-IDs-for-U-Sku/20170608-042543
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x014-201723 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

   In file included from include/drm/i915_drm.h:29:0,
                    from drivers/gpu/drm/i915/i915_gem_object.h:34,
                    from drivers/gpu/drm/i915/i915_vma.h:34,
                    from drivers/gpu/drm/i915/intel_uc.h:31,
                    from drivers/gpu/drm/i915/i915_drv.h:61,
                    from drivers/gpu/drm/i915/i915_pci.c:29:
   drivers/gpu/drm/i915/i915_pci.c:472:19: error: 'intel_coffeelake_gt3_info' undeclared here (not in a function)
     INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
                      ^
   include/drm/i915_pciids.h:42:18: note: in definition of macro 'INTEL_VGA_DEVICE'
     (unsigned long) info }
                     ^~~~
   drivers/gpu/drm/i915/i915_pci.c:472:2: note: in expansion of macro 'INTEL_CFL_U_IDS'
     INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
     ^~~~~~~~~~~~~~~
   drivers/gpu/drm/i915/i915_pci.c:473:19: error: 'intel_coffeelake_info' undeclared here (not in a function)
     INTEL_CFL_S_IDS(&intel_coffeelake_info),
                      ^
   include/drm/i915_pciids.h:42:18: note: in definition of macro 'INTEL_VGA_DEVICE'
     (unsigned long) info }
                     ^~~~
>> drivers/gpu/drm/i915/i915_pci.c:473:2: note: in expansion of macro 'INTEL_CFL_S_IDS'
     INTEL_CFL_S_IDS(&intel_coffeelake_info),
     ^~~~~~~~~~~~~~~

vim +/INTEL_CFL_S_IDS +473 drivers/gpu/drm/i915/i915_pci.c

   466		INTEL_BXT_IDS(&intel_broxton_info),
   467		INTEL_GLK_IDS(&intel_geminilake_info),
   468		INTEL_KBL_GT1_IDS(&intel_kabylake_info),
   469		INTEL_KBL_GT2_IDS(&intel_kabylake_info),
   470		INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
   471		INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
 > 472		INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
 > 473		INTEL_CFL_S_IDS(&intel_coffeelake_info),
   474		{0, 0, 0}
   475	};
   476	MODULE_DEVICE_TABLE(pci, pciidlist);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 7aec8ea..13eb415 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -483,6 +483,7 @@  static const struct pci_device_id pciidlist[] = {
 	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
 	INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
+	INTEL_CFL_S_IDS(&intel_coffeelake_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 132dd04..33dd853 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -340,8 +340,12 @@ 
 	INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
 
+#define INTEL_CFL_S_IDS(info) \
+	INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
+	INTEL_VGA_DEVICE(0x3E92, info)  /* SRV GT2 */
 
 #define INTEL_CFL_IDS(info) \
-	INTEL_CFL_U_IDS(info)
+	INTEL_CFL_U_IDS(info), \
+	INTEL_CFL_S_IDS(info)
 
 #endif /* _I915_PCIIDS_H */