Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML)
@ 2018-06-19 22:13 José Roberto de Souza
  2018-06-19 22:22 ` Rodrigo Vivi
  2018-06-19 22:49 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
  0 siblings, 2 replies; 4+ messages in thread
From: José Roberto de Souza @ 2018-06-19 22:13 UTC (permalink / raw)
  To: igt-dev; +Cc: Rodrigo Vivi

I just copied the Kernel file into the IGT repository.

Changes:
- b9be78531d27 - drm/i915/whl: Introducing Whiskey Lake platform
- e364672477a1 - drm/i915/aml: Introducing Amber Lake platform

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 lib/i915_pciids.h | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index bab70ff6..fbf5cfc9 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -349,7 +349,6 @@
 #define INTEL_KBL_GT2_IDS(info)	\
 	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
 	INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
-	INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
 	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
 	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
 	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
@@ -365,11 +364,17 @@
 #define INTEL_KBL_GT4_IDS(info) \
 	INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
 
+/* AML/KBL Y GT2 */
+#define INTEL_AML_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \
+	INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+
 #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)
+	INTEL_KBL_GT4_IDS(info), \
+	INTEL_AML_GT2_IDS(info)
 
 /* CFL S */
 #define INTEL_CFL_S_GT1_IDS(info) \
@@ -388,32 +393,40 @@
 	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
 	INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
 
-/* CFL U GT1 */
-#define INTEL_CFL_U_GT1_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA1, info), \
-	INTEL_VGA_DEVICE(0x3EA4, info)
-
 /* CFL U GT2 */
 #define INTEL_CFL_U_GT2_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA0, info), \
-	INTEL_VGA_DEVICE(0x3EA3, info), \
 	INTEL_VGA_DEVICE(0x3EA9, info)
 
 /* CFL U GT3 */
 #define INTEL_CFL_U_GT3_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA2, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x3EA8, info)  /* ULT GT3 */
 
+/* WHL/CFL U GT1 */
+#define INTEL_WHL_U_GT1_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA1, info)
+
+/* WHL/CFL U GT2 */
+#define INTEL_WHL_U_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA0, info)
+
+/* WHL/CFL U GT3 */
+#define INTEL_WHL_U_GT3_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA2, info), \
+	INTEL_VGA_DEVICE(0x3EA3, info), \
+	INTEL_VGA_DEVICE(0x3EA4, info)
+
 #define INTEL_CFL_IDS(info)	   \
 	INTEL_CFL_S_GT1_IDS(info), \
 	INTEL_CFL_S_GT2_IDS(info), \
 	INTEL_CFL_H_GT2_IDS(info), \
-	INTEL_CFL_U_GT1_IDS(info), \
 	INTEL_CFL_U_GT2_IDS(info), \
-	INTEL_CFL_U_GT3_IDS(info)
+	INTEL_CFL_U_GT3_IDS(info), \
+	INTEL_WHL_U_GT1_IDS(info), \
+	INTEL_WHL_U_GT2_IDS(info), \
+	INTEL_WHL_U_GT3_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_IDS(info) \
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML)
  2018-06-19 22:13 [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML) José Roberto de Souza
@ 2018-06-19 22:22 ` Rodrigo Vivi
  2018-06-19 22:25   ` Rodrigo Vivi
  2018-06-19 22:49 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
  1 sibling, 1 reply; 4+ messages in thread
From: Rodrigo Vivi @ 2018-06-19 22:22 UTC (permalink / raw)
  To: José Roberto de Souza; +Cc: igt-dev

On Tue, Jun 19, 2018 at 03:13:08PM -0700, José Roberto de Souza wrote:
> I just copied the Kernel file into the IGT repository.
> 
> Changes:
> - b9be78531d27 - drm/i915/whl: Introducing Whiskey Lake platform
> - e364672477a1 - drm/i915/aml: Introducing Amber Lake platform
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

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

> ---
>  lib/i915_pciids.h | 37 +++++++++++++++++++++++++------------
>  1 file changed, 25 insertions(+), 12 deletions(-)
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index bab70ff6..fbf5cfc9 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -349,7 +349,6 @@
>  #define INTEL_KBL_GT2_IDS(info)	\
>  	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
>  	INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> -	INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
>  	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
>  	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
>  	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
> @@ -365,11 +364,17 @@
>  #define INTEL_KBL_GT4_IDS(info) \
>  	INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
>  
> +/* AML/KBL Y GT2 */
> +#define INTEL_AML_GT2_IDS(info) \
> +	INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \
> +	INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
> +
>  #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)
> +	INTEL_KBL_GT4_IDS(info), \
> +	INTEL_AML_GT2_IDS(info)
>  
>  /* CFL S */
>  #define INTEL_CFL_S_GT1_IDS(info) \
> @@ -388,32 +393,40 @@
>  	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
>  	INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
>  
> -/* CFL U GT1 */
> -#define INTEL_CFL_U_GT1_IDS(info) \
> -	INTEL_VGA_DEVICE(0x3EA1, info), \
> -	INTEL_VGA_DEVICE(0x3EA4, info)
> -
>  /* CFL U GT2 */
>  #define INTEL_CFL_U_GT2_IDS(info) \
> -	INTEL_VGA_DEVICE(0x3EA0, info), \
> -	INTEL_VGA_DEVICE(0x3EA3, info), \
>  	INTEL_VGA_DEVICE(0x3EA9, info)
>  
>  /* CFL U GT3 */
>  #define INTEL_CFL_U_GT3_IDS(info) \
> -	INTEL_VGA_DEVICE(0x3EA2, info), /* ULT GT3 */ \
>  	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
>  	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
>  	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
>  	INTEL_VGA_DEVICE(0x3EA8, info)  /* ULT GT3 */
>  
> +/* WHL/CFL U GT1 */
> +#define INTEL_WHL_U_GT1_IDS(info) \
> +	INTEL_VGA_DEVICE(0x3EA1, info)
> +
> +/* WHL/CFL U GT2 */
> +#define INTEL_WHL_U_GT2_IDS(info) \
> +	INTEL_VGA_DEVICE(0x3EA0, info)
> +
> +/* WHL/CFL U GT3 */
> +#define INTEL_WHL_U_GT3_IDS(info) \
> +	INTEL_VGA_DEVICE(0x3EA2, info), \
> +	INTEL_VGA_DEVICE(0x3EA3, info), \
> +	INTEL_VGA_DEVICE(0x3EA4, info)
> +
>  #define INTEL_CFL_IDS(info)	   \
>  	INTEL_CFL_S_GT1_IDS(info), \
>  	INTEL_CFL_S_GT2_IDS(info), \
>  	INTEL_CFL_H_GT2_IDS(info), \
> -	INTEL_CFL_U_GT1_IDS(info), \
>  	INTEL_CFL_U_GT2_IDS(info), \
> -	INTEL_CFL_U_GT3_IDS(info)
> +	INTEL_CFL_U_GT3_IDS(info), \
> +	INTEL_WHL_U_GT1_IDS(info), \
> +	INTEL_WHL_U_GT2_IDS(info), \
> +	INTEL_WHL_U_GT3_IDS(info)
>  
>  /* CNL */
>  #define INTEL_CNL_IDS(info) \
> -- 
> 2.17.1
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML)
  2018-06-19 22:22 ` Rodrigo Vivi
@ 2018-06-19 22:25   ` Rodrigo Vivi
  0 siblings, 0 replies; 4+ messages in thread
From: Rodrigo Vivi @ 2018-06-19 22:25 UTC (permalink / raw)
  To: José Roberto de Souza; +Cc: igt-dev

On Tue, Jun 19, 2018 at 03:22:14PM -0700, Rodrigo Vivi wrote:
> On Tue, Jun 19, 2018 at 03:13:08PM -0700, José Roberto de Souza wrote:
> > I just copied the Kernel file into the IGT repository.
> > 
> > Changes:
> > - b9be78531d27 - drm/i915/whl: Introducing Whiskey Lake platform
> > - e364672477a1 - drm/i915/aml: Introducing Amber Lake platform
> > 
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

I take it back... it doesn't compile...

> 
> > ---
> >  lib/i915_pciids.h | 37 +++++++++++++++++++++++++------------
> >  1 file changed, 25 insertions(+), 12 deletions(-)
> > 
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> > index bab70ff6..fbf5cfc9 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -349,7 +349,6 @@
> >  #define INTEL_KBL_GT2_IDS(info)	\
> >  	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> >  	INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> > -	INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
> >  	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
> >  	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
> >  	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
> > @@ -365,11 +364,17 @@
> >  #define INTEL_KBL_GT4_IDS(info) \
> >  	INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
> >  
> > +/* AML/KBL Y GT2 */
> > +#define INTEL_AML_GT2_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \
> > +	INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
> > +
> >  #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)
> > +	INTEL_KBL_GT4_IDS(info), \
> > +	INTEL_AML_GT2_IDS(info)
> >  
> >  /* CFL S */
> >  #define INTEL_CFL_S_GT1_IDS(info) \
> > @@ -388,32 +393,40 @@
> >  	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> >  	INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
> >  
> > -/* CFL U GT1 */
> > -#define INTEL_CFL_U_GT1_IDS(info) \
> > -	INTEL_VGA_DEVICE(0x3EA1, info), \
> > -	INTEL_VGA_DEVICE(0x3EA4, info)
> > -
> >  /* CFL U GT2 */
> >  #define INTEL_CFL_U_GT2_IDS(info) \
> > -	INTEL_VGA_DEVICE(0x3EA0, info), \
> > -	INTEL_VGA_DEVICE(0x3EA3, info), \
> >  	INTEL_VGA_DEVICE(0x3EA9, info)
> >  
> >  /* CFL U GT3 */
> >  #define INTEL_CFL_U_GT3_IDS(info) \
> > -	INTEL_VGA_DEVICE(0x3EA2, info), /* ULT GT3 */ \
> >  	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
> >  	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
> >  	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
> >  	INTEL_VGA_DEVICE(0x3EA8, info)  /* ULT GT3 */
> >  
> > +/* WHL/CFL U GT1 */
> > +#define INTEL_WHL_U_GT1_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x3EA1, info)
> > +
> > +/* WHL/CFL U GT2 */
> > +#define INTEL_WHL_U_GT2_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x3EA0, info)
> > +
> > +/* WHL/CFL U GT3 */
> > +#define INTEL_WHL_U_GT3_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x3EA2, info), \
> > +	INTEL_VGA_DEVICE(0x3EA3, info), \
> > +	INTEL_VGA_DEVICE(0x3EA4, info)
> > +
> >  #define INTEL_CFL_IDS(info)	   \
> >  	INTEL_CFL_S_GT1_IDS(info), \
> >  	INTEL_CFL_S_GT2_IDS(info), \
> >  	INTEL_CFL_H_GT2_IDS(info), \
> > -	INTEL_CFL_U_GT1_IDS(info), \
> >  	INTEL_CFL_U_GT2_IDS(info), \
> > -	INTEL_CFL_U_GT3_IDS(info)
> > +	INTEL_CFL_U_GT3_IDS(info), \
> > +	INTEL_WHL_U_GT1_IDS(info), \
> > +	INTEL_WHL_U_GT2_IDS(info), \
> > +	INTEL_WHL_U_GT3_IDS(info)
> >  
> >  /* CNL */
> >  #define INTEL_CNL_IDS(info) \
> > -- 
> > 2.17.1
> > 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML)
  2018-06-19 22:13 [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML) José Roberto de Souza
  2018-06-19 22:22 ` Rodrigo Vivi
@ 2018-06-19 22:49 ` Patchwork
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2018-06-19 22:49 UTC (permalink / raw)
  To: José Roberto de Souza; +Cc: igt-dev

== Series Details ==

Series: lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML)
URL   : https://patchwork.freedesktop.org/series/45035/
State : failure

== Summary ==

IGT patchset build failed on latest successful build
9ab9268fa7eeda0a7ea6eb2ab02bb6c5b9c91ba0 lib: Conservatively include residual buffers in the available ram estimate

  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
 static const struct pci_id_match intel_device_match[] = {
                                                         ^
../lib/intel_device_info.c:352:2:
  INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
 static const struct pci_id_match intel_device_match[] = {
                                                         ^
../lib/intel_device_info.c:352:2:
  INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
 static const struct pci_id_match intel_device_match[] = {
                                                         ^
../lib/intel_device_info.c:352:2:
  INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
 static const struct pci_id_match intel_device_match[] = {
                                                         ^
../lib/intel_device_info.c:352:2:
  INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
 static const struct pci_id_match intel_device_match[] = {
                                                         ^
../lib/intel_device_info.c:352:2:
  INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
  {
../lib/intel_device_info.c:354:49:
  INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
                                                 }
ninja: build stopped: subcommand failed.

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-19 22:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-19 22:13 [igt-dev] [PATCH i-g-t] lib: sync with the newer i915_pciids.h from the Kernel (WHL + AML) José Roberto de Souza
2018-06-19 22:22 ` Rodrigo Vivi
2018-06-19 22:25   ` Rodrigo Vivi
2018-06-19 22:49 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox