Skip to contentSkip to conversation

drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.

PATCH In review Anusha Srivatsa 4 participants 7 messages Jun 6, 2017 – Jun 7, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.

Add PCI Ids for U Skus of Coffeelake.

v2: Use intel_coffeelake_gt3_info, in accordance to- Rodrigo's patch:
https://patchwork.freedesktop.org/patch/160148/

---
 drivers/gpu/drm/i915/i915_pci.c |  1 +
 include/drm/i915_pciids.h       | 10 ++++++++++
 2 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
index cf7cfe0..7aec8ea 100644
@@ -482,6 +482,7 @@ static const struct pci_device_id pciidlist[] = {
 	INTEL_KBL_GT2_IDS(&intel_kabylake_info),
 	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
+	INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
include/drm/i915_pciids.h +10 -0
index 27e0dba..132dd04 100644
@@ -334,4 +334,14 @@
 	INTEL_KBL_GT3_IDS(info), \
 	INTEL_KBL_GT4_IDS(info)
 
+#define INTEL_CFL_U_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
+
+
+#define INTEL_CFL_IDS(info) \
+	INTEL_CFL_U_IDS(info)
+
 #endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

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

Add PCI Ids for S Sku following the BSpec.

---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 include/drm/i915_pciids.h       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_pci.c +1 -0
index 7aec8ea..13eb415 100644
@@ -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);
include/drm/i915_pciids.h +5 -1
index 132dd04..33dd853 100644
@@ -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 */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

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

reproduce:

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 3/3 drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku.

In reply to Anusha Srivatsa

Add PCI Ids for H Sku by following the BSpec.

---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 include/drm/i915_pciids.h       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_pci.c +1 -0
index 13eb415..b9b33b4 100644
@@ -484,6 +484,7 @@ static const struct pci_device_id pciidlist[] = {
 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
 	INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
 	INTEL_CFL_S_IDS(&intel_coffeelake_info),
+	INTEL_CFL_H_IDS(&intel_coffeelake_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
include/drm/i915_pciids.h +5 -1
index 33dd853..0869771 100644
@@ -344,8 +344,12 @@
 	INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
 	INTEL_VGA_DEVICE(0x3E92, info)  /* SRV GT2 */
 
+#define INTEL_CFL_H_IDS(info) \
+	INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
+
 #define INTEL_CFL_IDS(info) \
 	INTEL_CFL_U_IDS(info), \
-	INTEL_CFL_S_IDS(info)
+	INTEL_CFL_S_IDS(info), \
+	INTEL_CFL_H_IDS(info)
 
 #endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#4 lore raw

Re: [PATCH 3/3] drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku.

Quoted 27 lines · Anusha Srivatsa

Add PCI Ids for H Sku by following the BSpec.

---
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 include/drm/i915_pciids.h       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_pci.c +1 -0
index 13eb415..b9b33b4 100644
@@ -484,6 +484,7 @@ static const struct pci_device_id pciidlist[] = {
 	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
 	INTEL_CFL_U_IDS(&intel_coffeelake_gt3_info),
 	INTEL_CFL_S_IDS(&intel_coffeelake_info),
+	INTEL_CFL_H_IDS(&intel_coffeelake_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
include/drm/i915_pciids.h +0 -0
index 33dd853..0869771 100644
@@ -344,8 +344,12 @@
 	INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \

include/drm/i915_pciids.h line 353

Quoted 10 lines
include/drm/i915_pciids.h +5 -1
 	INTEL_VGA_DEVICE(0x3E92, info)  /* SRV GT2 */
 
+#define INTEL_CFL_H_IDS(info) \
+	INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
+
 #define INTEL_CFL_IDS(info) \
 	INTEL_CFL_U_IDS(info), \
-	INTEL_CFL_S_IDS(info)
+	INTEL_CFL_S_IDS(info), \
+	INTEL_CFL_H_IDS(info)

Since we are not using this INTEL_CFL_IDS for anything anymore I believe we should avoid adding it at first place....

include/drm/i915_pciids.h line 355

Quoted 2 lines
include/drm/i915_pciids.h +0 -0
 #endif /* _I915_PCIIDS_H */

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
URL : https://patchwork.freedesktop.org/series/25364/
State : failure

== Summary ==

  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CHK     include/generated/bounds.h
  CHK     include/generated/timeconst.h
  CHK     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CHK     scripts/mod/devicetable-offsets.h
  CHK     include/generated/compile.h
  CHK     kernel/config_data.h
  CC [M]  drivers/gpu/drm/i915/i915_pci.o
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),
^
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_pci.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_pci.o] Error 1 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1016: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
In reply to Anusha Srivatsa
reproduce:

Hi Anusha,

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR 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 errors (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),
     ^~~~~~~~~~~~~~~

vim +/intel_coffeelake_gt3_info +472 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 {0, 0, 0}
474 };
475 MODULE_DEVICE_TABLE(pci, pciidlist);

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx