* [PATCH 2/3] drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
@ 2017-06-02 17:31 ` Anusha Srivatsa
2017-06-02 17:31 ` [PATCH 3/3] drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku Anusha Srivatsa
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Anusha Srivatsa @ 2017-06-02 17:31 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
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(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 4d25193..534b144 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -478,6 +478,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_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 */
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/3] drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
2017-06-02 17:31 ` [PATCH 2/3] drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus Anusha Srivatsa
@ 2017-06-02 17:31 ` Anusha Srivatsa
2017-06-02 17:55 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Anusha Srivatsa @ 2017-06-02 17:31 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Add PCI Ids for H Sku by 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(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 534b144..bbfe2ef 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -479,6 +479,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
INTEL_CFL_U_IDS(&intel_coffeelake_info),
INTEL_CFL_S_IDS(&intel_coffeelake_info),
+ INTEL_CFL_H_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 33dd853..0869771 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -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 */
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
2017-06-02 17:31 ` [PATCH 2/3] drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus Anusha Srivatsa
2017-06-02 17:31 ` [PATCH 3/3] drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku Anusha Srivatsa
@ 2017-06-02 17:55 ` Patchwork
2017-06-02 20:49 ` [PATCH 1/3] " Rodrigo Vivi
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-06-02 17:55 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== 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/25219/
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_info’ undeclared here (not in a function)
INTEL_CFL_U_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:472:2: note: in expansion of macro ‘INTEL_CFL_U_IDS’
INTEL_CFL_U_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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
` (2 preceding siblings ...)
2017-06-02 17:55 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Patchwork
@ 2017-06-02 20:49 ` Rodrigo Vivi
2017-06-02 20:51 ` Rodrigo Vivi
2017-06-03 3:33 ` kbuild test robot
5 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2017-06-02 20:49 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, Rodrigo Vivi
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Fri, Jun 2, 2017 at 10:31 AM, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Add PCI Ids for U Skus of Coffeelake.
>
> 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 | 10 ++++++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 31ea988..4d25193 100644
> --- 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 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_info),
> {0, 0, 0}
> };
> MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 27e0dba..132dd04 100644
> --- 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)
>
> +#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 */
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
` (3 preceding siblings ...)
2017-06-02 20:49 ` [PATCH 1/3] " Rodrigo Vivi
@ 2017-06-02 20:51 ` Rodrigo Vivi
2017-06-03 3:33 ` kbuild test robot
5 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2017-06-02 20:51 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, Rodrigo Vivi
ops, actually I take the rv-b back, sorry....
On Fri, Jun 2, 2017 at 10:31 AM, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Add PCI Ids for U Skus of Coffeelake.
>
> 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 | 10 ++++++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 31ea988..4d25193 100644
> --- 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 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_info),
it should be better with INTEL_CFL_IDS(info) here
> {0, 0, 0}
> };
> MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 27e0dba..132dd04 100644
> --- 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)
>
> +#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)
if not used better not to define ;)
but I prefer using it up there...
> +
> #endif /* _I915_PCIIDS_H */
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
2017-06-02 17:31 [PATCH 1/3] drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku Anusha Srivatsa
` (4 preceding siblings ...)
2017-06-02 20:51 ` Rodrigo Vivi
@ 2017-06-03 3:33 ` kbuild test robot
5 siblings, 0 replies; 9+ messages in thread
From: kbuild test robot @ 2017-06-03 3:33 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, kbuild-all, Rodrigo Vivi
[-- Attachment #1: Type: text/plain, Size: 2138 bytes --]
Hi Anusha,
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on v4.12-rc3 next-20170602]
[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/20170603-101317
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x014-201722 (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 error/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_info' undeclared here (not in a function)
INTEL_CFL_U_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:472:2: note: in expansion of macro 'INTEL_CFL_U_IDS'
INTEL_CFL_U_IDS(&intel_coffeelake_info),
^~~~~~~~~~~~~~~
vim +/intel_coffeelake_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_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
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 28686 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread