* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2019-02-02 8:08 Rodrigo Vivi
2019-02-02 8:46 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev3) Patchwork
` (3 more replies)
0 siblings, 4 replies; 22+ messages in thread
From: Rodrigo Vivi @ 2019-02-02 8:08 UTC (permalink / raw)
To: igt-dev; +Cc: Rodrigo Vivi
Add more PCI Device IDs for Coffee Lake and Ice Lake.
Align with kernel commits:
5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.")
03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice Lake")
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/i915_pciids.h | 8 ++++++++
lib/intel_device_info.c | 1 +
2 files changed, 9 insertions(+)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 19266714..d2fad7b0 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -394,6 +394,9 @@
INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */
/* CFL H */
+#define INTEL_CFL_H_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x3E9C, info)
+
#define INTEL_CFL_H_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
@@ -426,6 +429,7 @@
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
INTEL_CFL_S_GT2_IDS(info), \
+ INTEL_CFL_H_GT1_IDS(info), \
INTEL_CFL_H_GT2_IDS(info), \
INTEL_CFL_U_GT2_IDS(info), \
INTEL_CFL_U_GT3_IDS(info), \
@@ -457,9 +461,13 @@
INTEL_VGA_DEVICE(0x8A51, info), \
INTEL_VGA_DEVICE(0x8A5C, info), \
INTEL_VGA_DEVICE(0x8A5D, info), \
+ INTEL_VGA_DEVICE(0x8A59, info), \
+ INTEL_VGA_DEVICE(0x8A58, info), \
INTEL_VGA_DEVICE(0x8A52, info), \
INTEL_VGA_DEVICE(0x8A5A, info), \
INTEL_VGA_DEVICE(0x8A5B, info), \
+ INTEL_VGA_DEVICE(0x8A57, info), \
+ INTEL_VGA_DEVICE(0x8A56, info), \
INTEL_VGA_DEVICE(0x8A71, info), \
INTEL_VGA_DEVICE(0x8A70, info)
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 076168bf..2bca5183 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -351,6 +351,7 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
+ INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 22+ messages in thread* [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev3)
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
@ 2019-02-02 8:46 ` Patchwork
2019-02-02 10:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 22+ messages in thread
From: Patchwork @ 2019-02-02 8:46 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev
== Series Details ==
Series: lib: sync i915_pciids.h with kernel (rev3)
URL : https://patchwork.freedesktop.org/series/50957/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5527 -> IGTPW_2336
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50957/revisions/3/mbox/
Known issues
------------
Here are the changes found in IGTPW_2336 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: NOTRUN -> DMESG-WARN [fdo#102505] / [fdo#103558] / [fdo#105079] / [fdo#105602]
- fi-kbl-7567u: PASS -> WARN [fdo#109380]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
#### Possible fixes ####
* igt@pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: {SKIP} [fdo#109271] -> PASS
* igt@pm_rpm@basic-rte:
- fi-bsw-kefka: FAIL [fdo#108800] -> PASS
* igt@pm_rpm@module-reload:
- fi-skl-6770hq: FAIL [fdo#108511] -> PASS
* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: FAIL [fdo#103182] -> PASS +1
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
Participating hosts (48 -> 44)
------------------------------
Additional (2): fi-byt-j1900 fi-kbl-7500u
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* IGT: IGT_4803 -> IGTPW_2336
CI_DRM_5527: 482f9674140cbe8fddb18714bb95028cd9bfc1d1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2336: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2336/
IGT_4803: 973367176b61e81b5ca811620adb0467f6570aec @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2336/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for lib: sync i915_pciids.h with kernel (rev3)
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2019-02-02 8:46 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev3) Patchwork
@ 2019-02-02 10:38 ` Patchwork
2019-02-04 18:12 ` [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Lionel Landwerlin
2019-02-04 18:46 ` Souza, Jose
3 siblings, 0 replies; 22+ messages in thread
From: Patchwork @ 2019-02-02 10:38 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev
== Series Details ==
Series: lib: sync i915_pciids.h with kernel (rev3)
URL : https://patchwork.freedesktop.org/series/50957/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5527_full -> IGTPW_2336_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50957/revisions/3/mbox/
Known issues
------------
Here are the changes found in IGTPW_2336_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@pi-ringfull-bsd:
- shard-apl: NOTRUN -> FAIL [fdo#103158]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-glk: PASS -> FAIL [fdo#106641]
* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-render-c:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-kbl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-apl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-glk: PASS -> FAIL [fdo#103232] +2
- shard-apl: PASS -> FAIL [fdo#103232] +1
- shard-kbl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-apl: NOTRUN -> FAIL [fdo#109350]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-apl: PASS -> FAIL [fdo#102887] / [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-apl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
- shard-glk: NOTRUN -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-move:
- shard-glk: PASS -> FAIL [fdo#103167] +7
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: NOTRUN -> INCOMPLETE [fdo#103665]
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-glk: PASS -> FAIL [fdo#108948]
* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-glk: PASS -> FAIL [fdo#103166] +4
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-apl: PASS -> FAIL [fdo#103166]
* igt@kms_setmode@basic:
- shard-apl: PASS -> FAIL [fdo#99912]
- shard-hsw: PASS -> FAIL [fdo#99912]
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> FAIL [fdo#100047]
* igt@prime_busy@wait-hang-default:
- shard-glk: PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]
* igt@syncobj_wait@invalid-reset-illegal-handle:
- shard-snb: PASS -> INCOMPLETE [fdo#105411] / [fdo#107469]
#### Possible fixes ####
* igt@gem_mmap_gtt@hang:
- shard-glk: FAIL [fdo#109469] -> PASS
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-apl: FAIL [fdo#106510] / [fdo#108145] -> PASS
* igt@kms_color@pipe-a-legacy-gamma:
- shard-apl: FAIL [fdo#104782] / [fdo#108145] -> PASS
* igt@kms_color@pipe-b-ctm-max:
- shard-apl: FAIL [fdo#108147] -> PASS +1
- shard-kbl: FAIL [fdo#108147] -> PASS +1
* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS +3
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-glk: FAIL [fdo#103232] -> PASS
* igt@kms_cursor_crc@cursor-64x64-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: FAIL [fdo#105454] -> PASS
* igt@kms_flip_tiling@flip-x-tiled:
- shard-apl: DMESG-WARN [fdo#103558] / [fdo#105602] -> PASS +7
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: FAIL [fdo#103167] -> PASS +3
- shard-kbl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-glk: FAIL [fdo#103167] -> PASS +2
* igt@kms_frontbuffer_tracking@fbc-2p-rte:
- shard-glk: FAIL [fdo#103167] / [fdo#105682] -> PASS
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +4
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-glk: FAIL [fdo#108145] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-kbl: FAIL [fdo#103166] -> PASS +3
* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: FAIL [fdo#103166] -> PASS +2
* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS
* igt@perf@oa-exponents:
- shard-glk: FAIL [fdo#105483] -> PASS
* igt@pm_rc6_residency@rc6-accuracy:
- shard-snb: {SKIP} [fdo#109271] -> PASS
#### Warnings ####
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
- shard-apl: DMESG-FAIL [fdo#103558] / [fdo#105602] / [fdo#108145] -> FAIL [fdo#108145]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103158]: https://bugs.freedesktop.org/show_bug.cgi?id=103158
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105454]: https://bugs.freedesktop.org/show_bug.cgi?id=105454
[fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#109469]: https://bugs.freedesktop.org/show_bug.cgi?id=109469
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4803 -> IGTPW_2336
* Piglit: piglit_4509 -> None
CI_DRM_5527: 482f9674140cbe8fddb18714bb95028cd9bfc1d1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2336: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2336/
IGT_4803: 973367176b61e81b5ca811620adb0467f6570aec @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2336/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2019-02-02 8:46 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev3) Patchwork
2019-02-02 10:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2019-02-04 18:12 ` Lionel Landwerlin
2019-02-04 18:46 ` Souza, Jose
3 siblings, 0 replies; 22+ messages in thread
From: Lionel Landwerlin @ 2019-02-04 18:12 UTC (permalink / raw)
To: Rodrigo Vivi, igt-dev
On 02/02/2019 08:08, Rodrigo Vivi wrote:
> Add more PCI Device IDs for Coffee Lake and Ice Lake.
>
> Align with kernel commits:
>
> 5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.")
> 03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice Lake")
>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Since I reviewed the mesa ones :
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
> lib/i915_pciids.h | 8 ++++++++
> lib/intel_device_info.c | 1 +
> 2 files changed, 9 insertions(+)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 19266714..d2fad7b0 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -394,6 +394,9 @@
> INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */
>
> /* CFL H */
> +#define INTEL_CFL_H_GT1_IDS(info) \
> + INTEL_VGA_DEVICE(0x3E9C, info)
> +
> #define INTEL_CFL_H_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
> @@ -426,6 +429,7 @@
> #define INTEL_CFL_IDS(info) \
> INTEL_CFL_S_GT1_IDS(info), \
> INTEL_CFL_S_GT2_IDS(info), \
> + INTEL_CFL_H_GT1_IDS(info), \
> INTEL_CFL_H_GT2_IDS(info), \
> INTEL_CFL_U_GT2_IDS(info), \
> INTEL_CFL_U_GT3_IDS(info), \
> @@ -457,9 +461,13 @@
> INTEL_VGA_DEVICE(0x8A51, info), \
> INTEL_VGA_DEVICE(0x8A5C, info), \
> INTEL_VGA_DEVICE(0x8A5D, info), \
> + INTEL_VGA_DEVICE(0x8A59, info), \
> + INTEL_VGA_DEVICE(0x8A58, info), \
> INTEL_VGA_DEVICE(0x8A52, info), \
> INTEL_VGA_DEVICE(0x8A5A, info), \
> INTEL_VGA_DEVICE(0x8A5B, info), \
> + INTEL_VGA_DEVICE(0x8A57, info), \
> + INTEL_VGA_DEVICE(0x8A56, info), \
> INTEL_VGA_DEVICE(0x8A71, info), \
> INTEL_VGA_DEVICE(0x8A70, info)
>
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 076168bf..2bca5183 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -351,6 +351,7 @@ static const struct pci_id_match intel_device_match[] = {
>
> INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
> + INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
` (2 preceding siblings ...)
2019-02-04 18:12 ` [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Lionel Landwerlin
@ 2019-02-04 18:46 ` Souza, Jose
2019-02-04 18:47 ` Rodrigo Vivi
3 siblings, 1 reply; 22+ messages in thread
From: Souza, Jose @ 2019-02-04 18:46 UTC (permalink / raw)
To: Vivi, Rodrigo, igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 2395 bytes --]
On Sat, 2019-02-02 at 00:08 -0800, Rodrigo Vivi wrote:
> Add more PCI Device IDs for Coffee Lake and Ice Lake.
>
> Align with kernel commits:
>
> 5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.")
> 03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice
> Lake")
>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> lib/i915_pciids.h | 8 ++++++++
> lib/intel_device_info.c | 1 +
> 2 files changed, 9 insertions(+)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 19266714..d2fad7b0 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -394,6 +394,9 @@
> INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */
>
> /* CFL H */
> +#define INTEL_CFL_H_GT1_IDS(info) \
> + INTEL_VGA_DEVICE(0x3E9C, info)
> +
> #define INTEL_CFL_H_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
> @@ -426,6 +429,7 @@
> #define INTEL_CFL_IDS(info) \
> INTEL_CFL_S_GT1_IDS(info), \
> INTEL_CFL_S_GT2_IDS(info), \
> + INTEL_CFL_H_GT1_IDS(info), \
> INTEL_CFL_H_GT2_IDS(info), \
> INTEL_CFL_U_GT2_IDS(info), \
> INTEL_CFL_U_GT3_IDS(info), \
> @@ -457,9 +461,13 @@
> INTEL_VGA_DEVICE(0x8A51, info), \
> INTEL_VGA_DEVICE(0x8A5C, info), \
> INTEL_VGA_DEVICE(0x8A5D, info), \
> + INTEL_VGA_DEVICE(0x8A59, info), \
> + INTEL_VGA_DEVICE(0x8A58, info), \
> INTEL_VGA_DEVICE(0x8A52, info), \
> INTEL_VGA_DEVICE(0x8A5A, info), \
> INTEL_VGA_DEVICE(0x8A5B, info), \
> + INTEL_VGA_DEVICE(0x8A57, info), \
> + INTEL_VGA_DEVICE(0x8A56, info), \
> INTEL_VGA_DEVICE(0x8A71, info), \
> INTEL_VGA_DEVICE(0x8A70, info)
>
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 076168bf..2bca5183 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -351,6 +351,7 @@ static const struct pci_id_match
> intel_device_match[] = {
>
> INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
> + INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2019-02-04 18:46 ` Souza, Jose
@ 2019-02-04 18:47 ` Rodrigo Vivi
0 siblings, 0 replies; 22+ messages in thread
From: Rodrigo Vivi @ 2019-02-04 18:47 UTC (permalink / raw)
To: Souza, Jose; +Cc: igt-dev
On Mon, Feb 04, 2019 at 10:46:47AM -0800, Souza, Jose wrote:
> On Sat, 2019-02-02 at 00:08 -0800, Rodrigo Vivi wrote:
> > Add more PCI Device IDs for Coffee Lake and Ice Lake.
> >
> > Align with kernel commits:
> >
> > 5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.")
> > 03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice
> > Lake")
> >
>
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Thanks, although I already pushed all of them...
kernel, libdrm, igt, and mesa are in sync now.
>
> > Cc: José Roberto de Souza <jose.souza@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > lib/i915_pciids.h | 8 ++++++++
> > lib/intel_device_info.c | 1 +
> > 2 files changed, 9 insertions(+)
> >
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> > index 19266714..d2fad7b0 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -394,6 +394,9 @@
> > INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */
> >
> > /* CFL H */
> > +#define INTEL_CFL_H_GT1_IDS(info) \
> > + INTEL_VGA_DEVICE(0x3E9C, info)
> > +
> > #define INTEL_CFL_H_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> > INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
> > @@ -426,6 +429,7 @@
> > #define INTEL_CFL_IDS(info) \
> > INTEL_CFL_S_GT1_IDS(info), \
> > INTEL_CFL_S_GT2_IDS(info), \
> > + INTEL_CFL_H_GT1_IDS(info), \
> > INTEL_CFL_H_GT2_IDS(info), \
> > INTEL_CFL_U_GT2_IDS(info), \
> > INTEL_CFL_U_GT3_IDS(info), \
> > @@ -457,9 +461,13 @@
> > INTEL_VGA_DEVICE(0x8A51, info), \
> > INTEL_VGA_DEVICE(0x8A5C, info), \
> > INTEL_VGA_DEVICE(0x8A5D, info), \
> > + INTEL_VGA_DEVICE(0x8A59, info), \
> > + INTEL_VGA_DEVICE(0x8A58, info), \
> > INTEL_VGA_DEVICE(0x8A52, info), \
> > INTEL_VGA_DEVICE(0x8A5A, info), \
> > INTEL_VGA_DEVICE(0x8A5B, info), \
> > + INTEL_VGA_DEVICE(0x8A57, info), \
> > + INTEL_VGA_DEVICE(0x8A56, info), \
> > INTEL_VGA_DEVICE(0x8A71, info), \
> > INTEL_VGA_DEVICE(0x8A70, info)
> >
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 076168bf..2bca5183 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -351,6 +351,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> >
> > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
> > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
> > + INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
> > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
> > INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> > INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2022-07-27 4:34 Matt Roper
0 siblings, 0 replies; 22+ messages in thread
From: Matt Roper @ 2022-07-27 4:34 UTC (permalink / raw)
To: igt-dev
This synchronizes with kernel commit
7835303982d1 ("drm/i915/mtl: Add MeteorLake PCI IDs")
to bring in DG2/ATS-M and initial MTL PCI IDs.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
lib/i915_pciids.h | 55 +++++++++++++++++++++++++++++++++++++++++
lib/i915_pciids_local.h | 21 ----------------
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index a7b5eea7..278031aa 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -692,4 +692,59 @@
INTEL_VGA_DEVICE(0xA7A8, info), \
INTEL_VGA_DEVICE(0xA7A9, info)
+/* DG2 */
+#define INTEL_DG2_G10_IDS(info) \
+ INTEL_VGA_DEVICE(0x5690, info), \
+ INTEL_VGA_DEVICE(0x5691, info), \
+ INTEL_VGA_DEVICE(0x5692, info), \
+ INTEL_VGA_DEVICE(0x56A0, info), \
+ INTEL_VGA_DEVICE(0x56A1, info), \
+ INTEL_VGA_DEVICE(0x56A2, info)
+
+#define INTEL_DG2_G11_IDS(info) \
+ INTEL_VGA_DEVICE(0x5693, info), \
+ INTEL_VGA_DEVICE(0x5694, info), \
+ INTEL_VGA_DEVICE(0x5695, info), \
+ INTEL_VGA_DEVICE(0x5698, info), \
+ INTEL_VGA_DEVICE(0x56A5, info), \
+ INTEL_VGA_DEVICE(0x56A6, info), \
+ INTEL_VGA_DEVICE(0x56B0, info), \
+ INTEL_VGA_DEVICE(0x56B1, info)
+
+#define INTEL_DG2_G12_IDS(info) \
+ INTEL_VGA_DEVICE(0x5696, info), \
+ INTEL_VGA_DEVICE(0x5697, info), \
+ INTEL_VGA_DEVICE(0x56A3, info), \
+ INTEL_VGA_DEVICE(0x56A4, info), \
+ INTEL_VGA_DEVICE(0x56B2, info), \
+ INTEL_VGA_DEVICE(0x56B3, info)
+
+#define INTEL_DG2_IDS(info) \
+ INTEL_DG2_G10_IDS(info), \
+ INTEL_DG2_G11_IDS(info), \
+ INTEL_DG2_G12_IDS(info)
+
+#define INTEL_ATS_M150_IDS(info) \
+ INTEL_VGA_DEVICE(0x56C0, info)
+
+#define INTEL_ATS_M75_IDS(info) \
+ INTEL_VGA_DEVICE(0x56C1, info)
+
+#define INTEL_ATS_M_IDS(info) \
+ INTEL_ATS_M150_IDS(info), \
+ INTEL_ATS_M75_IDS(info)
+/* MTL */
+#define INTEL_MTL_M_IDS(info) \
+ INTEL_VGA_DEVICE(0x7D40, info), \
+ INTEL_VGA_DEVICE(0x7D60, info)
+
+#define INTEL_MTL_P_IDS(info) \
+ INTEL_VGA_DEVICE(0x7D45, info), \
+ INTEL_VGA_DEVICE(0x7D55, info), \
+ INTEL_VGA_DEVICE(0x7DD5, info)
+
+#define INTEL_MTL_IDS(info) \
+ INTEL_MTL_M_IDS(info), \
+ INTEL_MTL_P_IDS(info)
+
#endif /* _I915_PCIIDS_H */
diff --git a/lib/i915_pciids_local.h b/lib/i915_pciids_local.h
index b3ac70ff..91c26152 100644
--- a/lib/i915_pciids_local.h
+++ b/lib/i915_pciids_local.h
@@ -7,25 +7,4 @@
#include "i915_pciids.h"
-/* DG2 */
-#define INTEL_DG2_IDS(info) \
- INTEL_VGA_DEVICE(0x56A0, info), \
- INTEL_VGA_DEVICE(0x56A1, info), \
- INTEL_VGA_DEVICE(0x56A2, info), \
- INTEL_VGA_DEVICE(0x56A3, info), \
- INTEL_VGA_DEVICE(0x56A4, info), \
- INTEL_VGA_DEVICE(0x56A5, info), \
- INTEL_VGA_DEVICE(0x56A6, info)
-
-/* ATS-M */
-#define INTEL_ATS_M150_IDS(info) \
- INTEL_VGA_DEVICE(0x56C0, info)
-
-#define INTEL_ATS_M75_IDS(info) \
- INTEL_VGA_DEVICE(0x56C1, info)
-
-#define INTEL_ATS_M_IDS(info) \
- INTEL_ATS_M150_IDS(info), \
- INTEL_ATS_M75_IDS(info)
-
#endif /* _I915_PCIIDS_LOCAL_H */
--
2.37.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2021-06-03 14:31 Matt Roper
2021-06-03 15:05 ` James Ausmus
2021-06-03 18:58 ` Srivatsa, Anusha
0 siblings, 2 replies; 22+ messages in thread
From: Matt Roper @ 2021-06-03 14:31 UTC (permalink / raw)
To: igt-dev
This synchronizes with kernel commit
760759f2cf71 ("drm/i915/adl_p: Add PCI Devices IDs")
to bring in ADL-P PCI IDs as well as a couple more ADL-S IDs.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
lib/i915_pciids.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index ebd0dd1c..eee18fa5 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -640,9 +640,32 @@
INTEL_VGA_DEVICE(0x4681, info), \
INTEL_VGA_DEVICE(0x4682, info), \
INTEL_VGA_DEVICE(0x4683, info), \
+ INTEL_VGA_DEVICE(0x4688, info), \
+ INTEL_VGA_DEVICE(0x4689, info), \
INTEL_VGA_DEVICE(0x4690, info), \
INTEL_VGA_DEVICE(0x4691, info), \
INTEL_VGA_DEVICE(0x4692, info), \
INTEL_VGA_DEVICE(0x4693, info)
+/* ADL-P */
+#define INTEL_ADLP_IDS(info) \
+ INTEL_VGA_DEVICE(0x46A0, info), \
+ INTEL_VGA_DEVICE(0x46A1, info), \
+ INTEL_VGA_DEVICE(0x46A2, info), \
+ INTEL_VGA_DEVICE(0x46A3, info), \
+ INTEL_VGA_DEVICE(0x46A6, info), \
+ INTEL_VGA_DEVICE(0x46A8, info), \
+ INTEL_VGA_DEVICE(0x46AA, info), \
+ INTEL_VGA_DEVICE(0x462A, info), \
+ INTEL_VGA_DEVICE(0x4626, info), \
+ INTEL_VGA_DEVICE(0x4628, info), \
+ INTEL_VGA_DEVICE(0x46B0, info), \
+ INTEL_VGA_DEVICE(0x46B1, info), \
+ INTEL_VGA_DEVICE(0x46B2, info), \
+ INTEL_VGA_DEVICE(0x46B3, info), \
+ INTEL_VGA_DEVICE(0x46C0, info), \
+ INTEL_VGA_DEVICE(0x46C1, info), \
+ INTEL_VGA_DEVICE(0x46C2, info), \
+ INTEL_VGA_DEVICE(0x46C3, info)
+
#endif /* _I915_PCIIDS_H */
--
2.25.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2021-06-03 14:31 Matt Roper
@ 2021-06-03 15:05 ` James Ausmus
2021-06-03 18:58 ` Srivatsa, Anusha
1 sibling, 0 replies; 22+ messages in thread
From: James Ausmus @ 2021-06-03 15:05 UTC (permalink / raw)
To: Matt Roper; +Cc: igt-dev
On Thu, Jun 03, 2021 at 07:31:25AM -0700, Matt Roper wrote:
> This synchronizes with kernel commit
>
> 760759f2cf71 ("drm/i915/adl_p: Add PCI Devices IDs")
>
> to bring in ADL-P PCI IDs as well as a couple more ADL-S IDs.
>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> lib/i915_pciids.h | 23 +++++++++++++++++++++++
I think we need the changes to lib/intel_chipset.h
lib/intel_device_info.h as well before the ADL-P IDs can make a
difference
-James
> 1 file changed, 23 insertions(+)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index ebd0dd1c..eee18fa5 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -640,9 +640,32 @@
> INTEL_VGA_DEVICE(0x4681, info), \
> INTEL_VGA_DEVICE(0x4682, info), \
> INTEL_VGA_DEVICE(0x4683, info), \
> + INTEL_VGA_DEVICE(0x4688, info), \
> + INTEL_VGA_DEVICE(0x4689, info), \
> INTEL_VGA_DEVICE(0x4690, info), \
> INTEL_VGA_DEVICE(0x4691, info), \
> INTEL_VGA_DEVICE(0x4692, info), \
> INTEL_VGA_DEVICE(0x4693, info)
>
> +/* ADL-P */
> +#define INTEL_ADLP_IDS(info) \
> + INTEL_VGA_DEVICE(0x46A0, info), \
> + INTEL_VGA_DEVICE(0x46A1, info), \
> + INTEL_VGA_DEVICE(0x46A2, info), \
> + INTEL_VGA_DEVICE(0x46A3, info), \
> + INTEL_VGA_DEVICE(0x46A6, info), \
> + INTEL_VGA_DEVICE(0x46A8, info), \
> + INTEL_VGA_DEVICE(0x46AA, info), \
> + INTEL_VGA_DEVICE(0x462A, info), \
> + INTEL_VGA_DEVICE(0x4626, info), \
> + INTEL_VGA_DEVICE(0x4628, info), \
> + INTEL_VGA_DEVICE(0x46B0, info), \
> + INTEL_VGA_DEVICE(0x46B1, info), \
> + INTEL_VGA_DEVICE(0x46B2, info), \
> + INTEL_VGA_DEVICE(0x46B3, info), \
> + INTEL_VGA_DEVICE(0x46C0, info), \
> + INTEL_VGA_DEVICE(0x46C1, info), \
> + INTEL_VGA_DEVICE(0x46C2, info), \
> + INTEL_VGA_DEVICE(0x46C3, info)
> +
> #endif /* _I915_PCIIDS_H */
> --
> 2.25.4
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2021-06-03 14:31 Matt Roper
2021-06-03 15:05 ` James Ausmus
@ 2021-06-03 18:58 ` Srivatsa, Anusha
1 sibling, 0 replies; 22+ messages in thread
From: Srivatsa, Anusha @ 2021-06-03 18:58 UTC (permalink / raw)
To: Roper, Matthew D, igt-dev
> -----Original Message-----
> From: Roper, Matthew D <matthew.d.roper@intel.com>
> Sent: Thursday, June 3, 2021 7:31 AM
> To: igt-dev@lists.freedesktop.org
> Cc: Roper, Matthew D <matthew.d.roper@intel.com>
> Subject: [PATCH i-g-t] lib: sync i915_pciids.h with kernel
>
> This synchronizes with kernel commit
>
> 760759f2cf71 ("drm/i915/adl_p: Add PCI Devices IDs")
>
> to bring in ADL-P PCI IDs as well as a couple more ADL-S IDs.
>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> lib/i915_pciids.h | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index ebd0dd1c..eee18fa5
> 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -640,9 +640,32 @@
> INTEL_VGA_DEVICE(0x4681, info), \
> INTEL_VGA_DEVICE(0x4682, info), \
> INTEL_VGA_DEVICE(0x4683, info), \
> + INTEL_VGA_DEVICE(0x4688, info), \
> + INTEL_VGA_DEVICE(0x4689, info), \
> INTEL_VGA_DEVICE(0x4690, info), \
> INTEL_VGA_DEVICE(0x4691, info), \
> INTEL_VGA_DEVICE(0x4692, info), \
> INTEL_VGA_DEVICE(0x4693, info)
>
> +/* ADL-P */
> +#define INTEL_ADLP_IDS(info) \
> + INTEL_VGA_DEVICE(0x46A0, info), \
> + INTEL_VGA_DEVICE(0x46A1, info), \
> + INTEL_VGA_DEVICE(0x46A2, info), \
> + INTEL_VGA_DEVICE(0x46A3, info), \
> + INTEL_VGA_DEVICE(0x46A6, info), \
> + INTEL_VGA_DEVICE(0x46A8, info), \
> + INTEL_VGA_DEVICE(0x46AA, info), \
> + INTEL_VGA_DEVICE(0x462A, info), \
> + INTEL_VGA_DEVICE(0x4626, info), \
> + INTEL_VGA_DEVICE(0x4628, info), \
> + INTEL_VGA_DEVICE(0x46B0, info), \
> + INTEL_VGA_DEVICE(0x46B1, info), \
> + INTEL_VGA_DEVICE(0x46B2, info), \
> + INTEL_VGA_DEVICE(0x46B3, info), \
> + INTEL_VGA_DEVICE(0x46C0, info), \
> + INTEL_VGA_DEVICE(0x46C1, info), \
> + INTEL_VGA_DEVICE(0x46C2, info), \
> + INTEL_VGA_DEVICE(0x46C3, info)
> +
> #endif /* _I915_PCIIDS_H */
> --
> 2.25.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2020-10-23 3:18 Ashutosh Dixit
2020-10-23 7:59 ` Petri Latvala
0 siblings, 1 reply; 22+ messages in thread
From: Ashutosh Dixit @ 2020-10-23 3:18 UTC (permalink / raw)
To: igt-dev; +Cc: petri.latvala
Align with kernel commits:
605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
df3478af1d73c ("drm/i915: Sort CML PCI IDs")
cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
b50b7991b739c ("drm/i915/dg1: add more PCI ids")
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/i915_pciids.h | 141 ++++++++++++++++++++++++----------------------
1 file changed, 75 insertions(+), 66 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 7eeecb07c9..3b5ed1e4f3 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -170,9 +170,9 @@
#define INTEL_HSW_ULT_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
- INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0A06, info) /* ULT GT1 mobile */
+ INTEL_VGA_DEVICE(0x0A0B, info) /* ULT GT1 reserved */
#define INTEL_HSW_ULX_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */
@@ -181,26 +181,26 @@
INTEL_HSW_ULT_GT1_IDS(info), \
INTEL_HSW_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
- INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
+ INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x040A, info), /* GT1 server */ \
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \
INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \
INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */
+ INTEL_VGA_DEVICE(0x0D0E, info) /* CRW GT1 reserved */
#define INTEL_HSW_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
- INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0A16, info) /* ULT GT2 mobile */
+ INTEL_VGA_DEVICE(0x0A1B, info) /* ULT GT2 reserved */ \
#define INTEL_HSW_ULX_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \
@@ -209,45 +209,45 @@
INTEL_HSW_ULT_GT2_IDS(info), \
INTEL_HSW_ULX_GT2_IDS(info), \
INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
- INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
+ INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
+ INTEL_VGA_DEVICE(0x041A, info), /* GT2 server */ \
INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */
+ INTEL_VGA_DEVICE(0x0D1E, info) /* CRW GT2 reserved */
#define INTEL_HSW_ULT_GT3_IDS(info) \
INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
INTEL_VGA_DEVICE(0x0A2E, info) /* ULT GT3 reserved */
#define INTEL_HSW_GT3_IDS(info) \
INTEL_HSW_ULT_GT3_IDS(info), \
INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
- INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
+ INTEL_VGA_DEVICE(0x0426, info), /* GT3 mobile */ \
+ INTEL_VGA_DEVICE(0x042A, info), /* GT3 server */ \
INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0D26, info), /* CRW GT3 mobile */ \
INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
- INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
+ INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */
#define INTEL_HSW_IDS(info) \
INTEL_HSW_GT1_IDS(info), \
@@ -329,17 +329,20 @@
INTEL_VGA_DEVICE(0x22b3, info)
#define INTEL_SKL_ULT_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */
+ INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
+ INTEL_VGA_DEVICE(0x1913, info) /* ULT GT1.5 */
#define INTEL_SKL_ULX_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */
+ INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
+ INTEL_VGA_DEVICE(0x1915, info) /* ULX GT1.5 */
#define INTEL_SKL_GT1_IDS(info) \
INTEL_SKL_ULT_GT1_IDS(info), \
INTEL_SKL_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \
+ INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
+ INTEL_VGA_DEVICE(0x1917, info) /* DT GT1.5 */
#define INTEL_SKL_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
@@ -352,26 +355,26 @@
INTEL_SKL_ULT_GT2_IDS(info), \
INTEL_SKL_ULX_GT2_IDS(info), \
INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \
- INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
#define INTEL_SKL_ULT_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */
+ INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
+ INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3e */ \
+ INTEL_VGA_DEVICE(0x1927, info) /* ULT GT3e */
#define INTEL_SKL_GT3_IDS(info) \
INTEL_SKL_ULT_GT3_IDS(info), \
- INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
- INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
- INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
- INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */
+ INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
+ INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3e */ \
+ INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3e */
#define INTEL_SKL_GT4_IDS(info) \
INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
- INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
- INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
- INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
- INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */
+ INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
+ INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
+ INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
#define INTEL_SKL_IDS(info) \
INTEL_SKL_GT1_IDS(info), \
@@ -403,8 +406,8 @@
INTEL_KBL_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
+ INTEL_VGA_DEVICE(0x590A, info), /* SRV GT1 */ \
+ INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
#define INTEL_KBL_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
@@ -416,10 +419,10 @@
#define INTEL_KBL_GT2_IDS(info) \
INTEL_KBL_ULT_GT2_IDS(info), \
INTEL_KBL_ULX_GT2_IDS(info), \
- INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
- INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
+ INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
#define INTEL_KBL_ULT_GT3_IDS(info) \
@@ -444,10 +447,10 @@
/* CML GT1 */
#define INTEL_CML_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x9BA5, info), \
- INTEL_VGA_DEVICE(0x9BA8, info), \
+ INTEL_VGA_DEVICE(0x9BA2, info), \
INTEL_VGA_DEVICE(0x9BA4, info), \
- INTEL_VGA_DEVICE(0x9BA2, info)
+ INTEL_VGA_DEVICE(0x9BA5, info), \
+ INTEL_VGA_DEVICE(0x9BA8, info)
#define INTEL_CML_U_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x9B21, info), \
@@ -456,11 +459,11 @@
/* CML GT2 */
#define INTEL_CML_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x9BC5, info), \
- INTEL_VGA_DEVICE(0x9BC8, info), \
- INTEL_VGA_DEVICE(0x9BC4, info), \
INTEL_VGA_DEVICE(0x9BC2, info), \
+ INTEL_VGA_DEVICE(0x9BC4, info), \
+ INTEL_VGA_DEVICE(0x9BC5, info), \
INTEL_VGA_DEVICE(0x9BC6, info), \
+ INTEL_VGA_DEVICE(0x9BC8, info), \
INTEL_VGA_DEVICE(0x9BE6, info), \
INTEL_VGA_DEVICE(0x9BF6, info)
@@ -494,8 +497,8 @@
INTEL_VGA_DEVICE(0x3E9C, info)
#define INTEL_CFL_H_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
- INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
+ INTEL_VGA_DEVICE(0x3E94, info), /* Halo GT2 */ \
+ INTEL_VGA_DEVICE(0x3E9B, info) /* Halo GT2 */
/* CFL U GT2 */
#define INTEL_CFL_U_GT2_IDS(info) \
@@ -540,54 +543,57 @@
/* CNL */
#define INTEL_CNL_PORT_F_IDS(info) \
- INTEL_VGA_DEVICE(0x5A54, info), \
- INTEL_VGA_DEVICE(0x5A5C, info), \
INTEL_VGA_DEVICE(0x5A44, info), \
- INTEL_VGA_DEVICE(0x5A4C, info)
+ INTEL_VGA_DEVICE(0x5A4C, info), \
+ INTEL_VGA_DEVICE(0x5A54, info), \
+ INTEL_VGA_DEVICE(0x5A5C, info)
#define INTEL_CNL_IDS(info) \
INTEL_CNL_PORT_F_IDS(info), \
- INTEL_VGA_DEVICE(0x5A51, info), \
- INTEL_VGA_DEVICE(0x5A59, info), \
+ INTEL_VGA_DEVICE(0x5A40, info), \
INTEL_VGA_DEVICE(0x5A41, info), \
- INTEL_VGA_DEVICE(0x5A49, info), \
- INTEL_VGA_DEVICE(0x5A52, info), \
- INTEL_VGA_DEVICE(0x5A5A, info), \
INTEL_VGA_DEVICE(0x5A42, info), \
+ INTEL_VGA_DEVICE(0x5A49, info), \
INTEL_VGA_DEVICE(0x5A4A, info), \
INTEL_VGA_DEVICE(0x5A50, info), \
- INTEL_VGA_DEVICE(0x5A40, info)
+ INTEL_VGA_DEVICE(0x5A51, info), \
+ INTEL_VGA_DEVICE(0x5A52, info), \
+ INTEL_VGA_DEVICE(0x5A59, info), \
+ INTEL_VGA_DEVICE(0x5A5A, info)
/* ICL */
#define INTEL_ICL_PORT_F_IDS(info) \
INTEL_VGA_DEVICE(0x8A50, info), \
- INTEL_VGA_DEVICE(0x8A5C, info), \
- INTEL_VGA_DEVICE(0x8A59, info), \
- INTEL_VGA_DEVICE(0x8A58, info), \
INTEL_VGA_DEVICE(0x8A52, info), \
+ INTEL_VGA_DEVICE(0x8A53, info), \
+ INTEL_VGA_DEVICE(0x8A54, info), \
+ INTEL_VGA_DEVICE(0x8A56, info), \
+ INTEL_VGA_DEVICE(0x8A57, info), \
+ INTEL_VGA_DEVICE(0x8A58, info), \
+ INTEL_VGA_DEVICE(0x8A59, info), \
INTEL_VGA_DEVICE(0x8A5A, info), \
INTEL_VGA_DEVICE(0x8A5B, info), \
- INTEL_VGA_DEVICE(0x8A57, info), \
- INTEL_VGA_DEVICE(0x8A56, info), \
- INTEL_VGA_DEVICE(0x8A71, info), \
+ INTEL_VGA_DEVICE(0x8A5C, info), \
INTEL_VGA_DEVICE(0x8A70, info), \
- INTEL_VGA_DEVICE(0x8A53, info), \
- INTEL_VGA_DEVICE(0x8A54, info)
+ INTEL_VGA_DEVICE(0x8A71, info)
#define INTEL_ICL_11_IDS(info) \
INTEL_ICL_PORT_F_IDS(info), \
INTEL_VGA_DEVICE(0x8A51, info), \
INTEL_VGA_DEVICE(0x8A5D, info)
-/* EHL/JSL */
+/* EHL */
#define INTEL_EHL_IDS(info) \
INTEL_VGA_DEVICE(0x4500, info), \
INTEL_VGA_DEVICE(0x4571, info), \
INTEL_VGA_DEVICE(0x4551, info), \
INTEL_VGA_DEVICE(0x4541, info), \
- INTEL_VGA_DEVICE(0x4E71, info), \
INTEL_VGA_DEVICE(0x4557, info), \
- INTEL_VGA_DEVICE(0x4555, info), \
+ INTEL_VGA_DEVICE(0x4555, info)
+
+/* JSL */
+#define INTEL_JSL_IDS(info) \
+ INTEL_VGA_DEVICE(0x4E71, info), \
INTEL_VGA_DEVICE(0x4E61, info), \
INTEL_VGA_DEVICE(0x4E57, info), \
INTEL_VGA_DEVICE(0x4E55, info), \
@@ -624,6 +630,9 @@
/* DG1 */
#define INTEL_DG1_IDS(info) \
- INTEL_VGA_DEVICE(0x4905, info)
+ INTEL_VGA_DEVICE(0x4905, info), \
+ INTEL_VGA_DEVICE(0x4906, info), \
+ INTEL_VGA_DEVICE(0x4907, info), \
+ INTEL_VGA_DEVICE(0x4908, info)
#endif /* _I915_PCIIDS_H */
--
2.26.2.108.g048abe1751
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2020-10-23 3:18 Ashutosh Dixit
@ 2020-10-23 7:59 ` Petri Latvala
2020-10-23 8:03 ` Petri Latvala
0 siblings, 1 reply; 22+ messages in thread
From: Petri Latvala @ 2020-10-23 7:59 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
On Thu, Oct 22, 2020 at 08:18:59PM -0700, Ashutosh Dixit wrote:
> Align with kernel commits:
>
> 605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
> 514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
> 32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
> df3478af1d73c ("drm/i915: Sort CML PCI IDs")
> cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
> b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
> 9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
> 79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
> cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
> 03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
> 812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
> 194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
> 82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
> 24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
> b50b7991b739c ("drm/i915/dg1: add more PCI ids")
>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> ---
I get really confused by commit messages like this. Which commit is
this now copied from, and which repo has that commit?
--
Petri Latvala
> lib/i915_pciids.h | 141 ++++++++++++++++++++++++----------------------
> 1 file changed, 75 insertions(+), 66 deletions(-)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 7eeecb07c9..3b5ed1e4f3 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -170,9 +170,9 @@
>
> #define INTEL_HSW_ULT_GT1_IDS(info) \
> INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
> + INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
> INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
> - INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
> - INTEL_VGA_DEVICE(0x0A06, info) /* ULT GT1 mobile */
> + INTEL_VGA_DEVICE(0x0A0B, info) /* ULT GT1 reserved */
>
> #define INTEL_HSW_ULX_GT1_IDS(info) \
> INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */
> @@ -181,26 +181,26 @@
> INTEL_HSW_ULT_GT1_IDS(info), \
> INTEL_HSW_ULX_GT1_IDS(info), \
> INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
> - INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
> + INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
> + INTEL_VGA_DEVICE(0x040A, info), /* GT1 server */ \
> INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
> INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \
> INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \
> + INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
> INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
> INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
> INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
> INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
> + INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \
> INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
> INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
> - INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
> - INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
> - INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
> - INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */
> + INTEL_VGA_DEVICE(0x0D0E, info) /* CRW GT1 reserved */
>
> #define INTEL_HSW_ULT_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
> + INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
> INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
> - INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
> - INTEL_VGA_DEVICE(0x0A16, info) /* ULT GT2 mobile */
> + INTEL_VGA_DEVICE(0x0A1B, info) /* ULT GT2 reserved */ \
>
> #define INTEL_HSW_ULX_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \
> @@ -209,45 +209,45 @@
> INTEL_HSW_ULT_GT2_IDS(info), \
> INTEL_HSW_ULX_GT2_IDS(info), \
> INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
> - INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
> + INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
> + INTEL_VGA_DEVICE(0x041A, info), /* GT2 server */ \
> INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
> INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
> INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
> + INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
> INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
> INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
> INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
> INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
> + INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
> INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
> INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
> - INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
> - INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
> - INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
> - INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
> - INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */
> + INTEL_VGA_DEVICE(0x0D1E, info) /* CRW GT2 reserved */
>
> #define INTEL_HSW_ULT_GT3_IDS(info) \
> INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
> + INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
> INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
> INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
> - INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
> INTEL_VGA_DEVICE(0x0A2E, info) /* ULT GT3 reserved */
>
> #define INTEL_HSW_GT3_IDS(info) \
> INTEL_HSW_ULT_GT3_IDS(info), \
> INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
> - INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
> + INTEL_VGA_DEVICE(0x0426, info), /* GT3 mobile */ \
> + INTEL_VGA_DEVICE(0x042A, info), /* GT3 server */ \
> INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
> INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
> INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
> + INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
> INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
> INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
> INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
> INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
> + INTEL_VGA_DEVICE(0x0D26, info), /* CRW GT3 mobile */ \
> INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
> INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
> - INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
> - INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
> - INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
> + INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */
>
> #define INTEL_HSW_IDS(info) \
> INTEL_HSW_GT1_IDS(info), \
> @@ -329,17 +329,20 @@
> INTEL_VGA_DEVICE(0x22b3, info)
>
> #define INTEL_SKL_ULT_GT1_IDS(info) \
> - INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */
> + INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
> + INTEL_VGA_DEVICE(0x1913, info) /* ULT GT1.5 */
>
> #define INTEL_SKL_ULX_GT1_IDS(info) \
> - INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */
> + INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
> + INTEL_VGA_DEVICE(0x1915, info) /* ULX GT1.5 */
>
> #define INTEL_SKL_GT1_IDS(info) \
> INTEL_SKL_ULT_GT1_IDS(info), \
> INTEL_SKL_ULX_GT1_IDS(info), \
> INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \
> + INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
> INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
> - INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
> + INTEL_VGA_DEVICE(0x1917, info) /* DT GT1.5 */
>
> #define INTEL_SKL_ULT_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
> @@ -352,26 +355,26 @@
> INTEL_SKL_ULT_GT2_IDS(info), \
> INTEL_SKL_ULX_GT2_IDS(info), \
> INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \
> - INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
> + INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
>
> #define INTEL_SKL_ULT_GT3_IDS(info) \
> - INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */
> + INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
> + INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3e */ \
> + INTEL_VGA_DEVICE(0x1927, info) /* ULT GT3e */
>
> #define INTEL_SKL_GT3_IDS(info) \
> INTEL_SKL_ULT_GT3_IDS(info), \
> - INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
> - INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
> - INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
> - INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */
> + INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
> + INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3e */ \
> + INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3e */
>
> #define INTEL_SKL_GT4_IDS(info) \
> INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
> - INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
> - INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
> - INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
> - INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */
> + INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
> + INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
> + INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
>
> #define INTEL_SKL_IDS(info) \
> INTEL_SKL_GT1_IDS(info), \
> @@ -403,8 +406,8 @@
> INTEL_KBL_ULX_GT1_IDS(info), \
> INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
> INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
> - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
> - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
> + INTEL_VGA_DEVICE(0x590A, info), /* SRV GT1 */ \
> + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
>
> #define INTEL_KBL_ULT_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> @@ -416,10 +419,10 @@
> #define INTEL_KBL_GT2_IDS(info) \
> INTEL_KBL_ULT_GT2_IDS(info), \
> INTEL_KBL_ULX_GT2_IDS(info), \
> - INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
> - INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> + INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> + INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
>
> #define INTEL_KBL_ULT_GT3_IDS(info) \
> @@ -444,10 +447,10 @@
>
> /* CML GT1 */
> #define INTEL_CML_GT1_IDS(info) \
> - INTEL_VGA_DEVICE(0x9BA5, info), \
> - INTEL_VGA_DEVICE(0x9BA8, info), \
> + INTEL_VGA_DEVICE(0x9BA2, info), \
> INTEL_VGA_DEVICE(0x9BA4, info), \
> - INTEL_VGA_DEVICE(0x9BA2, info)
> + INTEL_VGA_DEVICE(0x9BA5, info), \
> + INTEL_VGA_DEVICE(0x9BA8, info)
>
> #define INTEL_CML_U_GT1_IDS(info) \
> INTEL_VGA_DEVICE(0x9B21, info), \
> @@ -456,11 +459,11 @@
>
> /* CML GT2 */
> #define INTEL_CML_GT2_IDS(info) \
> - INTEL_VGA_DEVICE(0x9BC5, info), \
> - INTEL_VGA_DEVICE(0x9BC8, info), \
> - INTEL_VGA_DEVICE(0x9BC4, info), \
> INTEL_VGA_DEVICE(0x9BC2, info), \
> + INTEL_VGA_DEVICE(0x9BC4, info), \
> + INTEL_VGA_DEVICE(0x9BC5, info), \
> INTEL_VGA_DEVICE(0x9BC6, info), \
> + INTEL_VGA_DEVICE(0x9BC8, info), \
> INTEL_VGA_DEVICE(0x9BE6, info), \
> INTEL_VGA_DEVICE(0x9BF6, info)
>
> @@ -494,8 +497,8 @@
> INTEL_VGA_DEVICE(0x3E9C, info)
>
> #define INTEL_CFL_H_GT2_IDS(info) \
> - INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> - INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
> + INTEL_VGA_DEVICE(0x3E94, info), /* Halo GT2 */ \
> + INTEL_VGA_DEVICE(0x3E9B, info) /* Halo GT2 */
>
> /* CFL U GT2 */
> #define INTEL_CFL_U_GT2_IDS(info) \
> @@ -540,54 +543,57 @@
>
> /* CNL */
> #define INTEL_CNL_PORT_F_IDS(info) \
> - INTEL_VGA_DEVICE(0x5A54, info), \
> - INTEL_VGA_DEVICE(0x5A5C, info), \
> INTEL_VGA_DEVICE(0x5A44, info), \
> - INTEL_VGA_DEVICE(0x5A4C, info)
> + INTEL_VGA_DEVICE(0x5A4C, info), \
> + INTEL_VGA_DEVICE(0x5A54, info), \
> + INTEL_VGA_DEVICE(0x5A5C, info)
>
> #define INTEL_CNL_IDS(info) \
> INTEL_CNL_PORT_F_IDS(info), \
> - INTEL_VGA_DEVICE(0x5A51, info), \
> - INTEL_VGA_DEVICE(0x5A59, info), \
> + INTEL_VGA_DEVICE(0x5A40, info), \
> INTEL_VGA_DEVICE(0x5A41, info), \
> - INTEL_VGA_DEVICE(0x5A49, info), \
> - INTEL_VGA_DEVICE(0x5A52, info), \
> - INTEL_VGA_DEVICE(0x5A5A, info), \
> INTEL_VGA_DEVICE(0x5A42, info), \
> + INTEL_VGA_DEVICE(0x5A49, info), \
> INTEL_VGA_DEVICE(0x5A4A, info), \
> INTEL_VGA_DEVICE(0x5A50, info), \
> - INTEL_VGA_DEVICE(0x5A40, info)
> + INTEL_VGA_DEVICE(0x5A51, info), \
> + INTEL_VGA_DEVICE(0x5A52, info), \
> + INTEL_VGA_DEVICE(0x5A59, info), \
> + INTEL_VGA_DEVICE(0x5A5A, info)
>
> /* ICL */
> #define INTEL_ICL_PORT_F_IDS(info) \
> INTEL_VGA_DEVICE(0x8A50, info), \
> - INTEL_VGA_DEVICE(0x8A5C, info), \
> - INTEL_VGA_DEVICE(0x8A59, info), \
> - INTEL_VGA_DEVICE(0x8A58, info), \
> INTEL_VGA_DEVICE(0x8A52, info), \
> + INTEL_VGA_DEVICE(0x8A53, info), \
> + INTEL_VGA_DEVICE(0x8A54, info), \
> + INTEL_VGA_DEVICE(0x8A56, info), \
> + INTEL_VGA_DEVICE(0x8A57, info), \
> + INTEL_VGA_DEVICE(0x8A58, info), \
> + INTEL_VGA_DEVICE(0x8A59, info), \
> INTEL_VGA_DEVICE(0x8A5A, info), \
> INTEL_VGA_DEVICE(0x8A5B, info), \
> - INTEL_VGA_DEVICE(0x8A57, info), \
> - INTEL_VGA_DEVICE(0x8A56, info), \
> - INTEL_VGA_DEVICE(0x8A71, info), \
> + INTEL_VGA_DEVICE(0x8A5C, info), \
> INTEL_VGA_DEVICE(0x8A70, info), \
> - INTEL_VGA_DEVICE(0x8A53, info), \
> - INTEL_VGA_DEVICE(0x8A54, info)
> + INTEL_VGA_DEVICE(0x8A71, info)
>
> #define INTEL_ICL_11_IDS(info) \
> INTEL_ICL_PORT_F_IDS(info), \
> INTEL_VGA_DEVICE(0x8A51, info), \
> INTEL_VGA_DEVICE(0x8A5D, info)
>
> -/* EHL/JSL */
> +/* EHL */
> #define INTEL_EHL_IDS(info) \
> INTEL_VGA_DEVICE(0x4500, info), \
> INTEL_VGA_DEVICE(0x4571, info), \
> INTEL_VGA_DEVICE(0x4551, info), \
> INTEL_VGA_DEVICE(0x4541, info), \
> - INTEL_VGA_DEVICE(0x4E71, info), \
> INTEL_VGA_DEVICE(0x4557, info), \
> - INTEL_VGA_DEVICE(0x4555, info), \
> + INTEL_VGA_DEVICE(0x4555, info)
> +
> +/* JSL */
> +#define INTEL_JSL_IDS(info) \
> + INTEL_VGA_DEVICE(0x4E71, info), \
> INTEL_VGA_DEVICE(0x4E61, info), \
> INTEL_VGA_DEVICE(0x4E57, info), \
> INTEL_VGA_DEVICE(0x4E55, info), \
> @@ -624,6 +630,9 @@
>
> /* DG1 */
> #define INTEL_DG1_IDS(info) \
> - INTEL_VGA_DEVICE(0x4905, info)
> + INTEL_VGA_DEVICE(0x4905, info), \
> + INTEL_VGA_DEVICE(0x4906, info), \
> + INTEL_VGA_DEVICE(0x4907, info), \
> + INTEL_VGA_DEVICE(0x4908, info)
>
> #endif /* _I915_PCIIDS_H */
> --
> 2.26.2.108.g048abe1751
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2020-10-23 7:59 ` Petri Latvala
@ 2020-10-23 8:03 ` Petri Latvala
2020-10-23 15:55 ` Dixit, Ashutosh
0 siblings, 1 reply; 22+ messages in thread
From: Petri Latvala @ 2020-10-23 8:03 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
On Fri, Oct 23, 2020 at 10:59:27AM +0300, Petri Latvala wrote:
> On Thu, Oct 22, 2020 at 08:18:59PM -0700, Ashutosh Dixit wrote:
> > Align with kernel commits:
> >
> > 605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
> > 514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
> > 32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
> > df3478af1d73c ("drm/i915: Sort CML PCI IDs")
> > cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
> > b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
> > 9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
> > 79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
> > cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
> > 03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
> > 812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
> > 194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
> > 82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
> > 24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
> > b50b7991b739c ("drm/i915/dg1: add more PCI ids")
> >
> > Cc: Petri Latvala <petri.latvala@intel.com>
> > Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> > ---
>
> I get really confused by commit messages like this. Which commit is
> this now copied from, and which repo has that commit?
Regardless of that confusion, the file matches what's in drm-tip so
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
>
>
> --
> Petri Latvala
>
>
>
> > lib/i915_pciids.h | 141 ++++++++++++++++++++++++----------------------
> > 1 file changed, 75 insertions(+), 66 deletions(-)
> >
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> > index 7eeecb07c9..3b5ed1e4f3 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -170,9 +170,9 @@
> >
> > #define INTEL_HSW_ULT_GT1_IDS(info) \
> > INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
> > + INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
> > INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
> > - INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
> > - INTEL_VGA_DEVICE(0x0A06, info) /* ULT GT1 mobile */
> > + INTEL_VGA_DEVICE(0x0A0B, info) /* ULT GT1 reserved */
> >
> > #define INTEL_HSW_ULX_GT1_IDS(info) \
> > INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */
> > @@ -181,26 +181,26 @@
> > INTEL_HSW_ULT_GT1_IDS(info), \
> > INTEL_HSW_ULX_GT1_IDS(info), \
> > INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
> > - INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
> > + INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
> > + INTEL_VGA_DEVICE(0x040A, info), /* GT1 server */ \
> > INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
> > INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \
> > INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \
> > + INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
> > INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
> > INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
> > INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
> > INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
> > + INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \
> > INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
> > INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
> > - INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
> > - INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
> > - INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
> > - INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */
> > + INTEL_VGA_DEVICE(0x0D0E, info) /* CRW GT1 reserved */
> >
> > #define INTEL_HSW_ULT_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
> > + INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
> > INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
> > - INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
> > - INTEL_VGA_DEVICE(0x0A16, info) /* ULT GT2 mobile */
> > + INTEL_VGA_DEVICE(0x0A1B, info) /* ULT GT2 reserved */ \
> >
> > #define INTEL_HSW_ULX_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \
> > @@ -209,45 +209,45 @@
> > INTEL_HSW_ULT_GT2_IDS(info), \
> > INTEL_HSW_ULX_GT2_IDS(info), \
> > INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
> > - INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
> > + INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
> > + INTEL_VGA_DEVICE(0x041A, info), /* GT2 server */ \
> > INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
> > INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
> > INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
> > + INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
> > INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
> > INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
> > INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
> > INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
> > + INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
> > INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
> > INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
> > - INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
> > - INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
> > - INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
> > - INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
> > - INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */
> > + INTEL_VGA_DEVICE(0x0D1E, info) /* CRW GT2 reserved */
> >
> > #define INTEL_HSW_ULT_GT3_IDS(info) \
> > INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
> > + INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
> > INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
> > INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
> > - INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
> > INTEL_VGA_DEVICE(0x0A2E, info) /* ULT GT3 reserved */
> >
> > #define INTEL_HSW_GT3_IDS(info) \
> > INTEL_HSW_ULT_GT3_IDS(info), \
> > INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
> > - INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
> > + INTEL_VGA_DEVICE(0x0426, info), /* GT3 mobile */ \
> > + INTEL_VGA_DEVICE(0x042A, info), /* GT3 server */ \
> > INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
> > INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
> > INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
> > + INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
> > INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
> > INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
> > INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
> > INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
> > + INTEL_VGA_DEVICE(0x0D26, info), /* CRW GT3 mobile */ \
> > INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
> > INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
> > - INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
> > - INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
> > - INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
> > + INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */
> >
> > #define INTEL_HSW_IDS(info) \
> > INTEL_HSW_GT1_IDS(info), \
> > @@ -329,17 +329,20 @@
> > INTEL_VGA_DEVICE(0x22b3, info)
> >
> > #define INTEL_SKL_ULT_GT1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */
> > + INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
> > + INTEL_VGA_DEVICE(0x1913, info) /* ULT GT1.5 */
> >
> > #define INTEL_SKL_ULX_GT1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */
> > + INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
> > + INTEL_VGA_DEVICE(0x1915, info) /* ULX GT1.5 */
> >
> > #define INTEL_SKL_GT1_IDS(info) \
> > INTEL_SKL_ULT_GT1_IDS(info), \
> > INTEL_SKL_ULX_GT1_IDS(info), \
> > INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \
> > + INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
> > INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
> > - INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
> > + INTEL_VGA_DEVICE(0x1917, info) /* DT GT1.5 */
> >
> > #define INTEL_SKL_ULT_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
> > @@ -352,26 +355,26 @@
> > INTEL_SKL_ULT_GT2_IDS(info), \
> > INTEL_SKL_ULX_GT2_IDS(info), \
> > INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \
> > - INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> > INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
> > + INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> > INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
> >
> > #define INTEL_SKL_ULT_GT3_IDS(info) \
> > - INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */
> > + INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
> > + INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3e */ \
> > + INTEL_VGA_DEVICE(0x1927, info) /* ULT GT3e */
> >
> > #define INTEL_SKL_GT3_IDS(info) \
> > INTEL_SKL_ULT_GT3_IDS(info), \
> > - INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
> > - INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
> > - INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
> > - INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */
> > + INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
> > + INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3e */ \
> > + INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3e */
> >
> > #define INTEL_SKL_GT4_IDS(info) \
> > INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
> > - INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
> > - INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
> > - INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
> > - INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */
> > + INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
> > + INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
> > + INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
> >
> > #define INTEL_SKL_IDS(info) \
> > INTEL_SKL_GT1_IDS(info), \
> > @@ -403,8 +406,8 @@
> > INTEL_KBL_ULX_GT1_IDS(info), \
> > INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
> > INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
> > - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
> > - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
> > + INTEL_VGA_DEVICE(0x590A, info), /* SRV GT1 */ \
> > + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
> >
> > #define INTEL_KBL_ULT_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> > @@ -416,10 +419,10 @@
> > #define INTEL_KBL_GT2_IDS(info) \
> > INTEL_KBL_ULT_GT2_IDS(info), \
> > INTEL_KBL_ULX_GT2_IDS(info), \
> > - INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
> > - INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> > + INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
> > INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> > + INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> > INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
> >
> > #define INTEL_KBL_ULT_GT3_IDS(info) \
> > @@ -444,10 +447,10 @@
> >
> > /* CML GT1 */
> > #define INTEL_CML_GT1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x9BA5, info), \
> > - INTEL_VGA_DEVICE(0x9BA8, info), \
> > + INTEL_VGA_DEVICE(0x9BA2, info), \
> > INTEL_VGA_DEVICE(0x9BA4, info), \
> > - INTEL_VGA_DEVICE(0x9BA2, info)
> > + INTEL_VGA_DEVICE(0x9BA5, info), \
> > + INTEL_VGA_DEVICE(0x9BA8, info)
> >
> > #define INTEL_CML_U_GT1_IDS(info) \
> > INTEL_VGA_DEVICE(0x9B21, info), \
> > @@ -456,11 +459,11 @@
> >
> > /* CML GT2 */
> > #define INTEL_CML_GT2_IDS(info) \
> > - INTEL_VGA_DEVICE(0x9BC5, info), \
> > - INTEL_VGA_DEVICE(0x9BC8, info), \
> > - INTEL_VGA_DEVICE(0x9BC4, info), \
> > INTEL_VGA_DEVICE(0x9BC2, info), \
> > + INTEL_VGA_DEVICE(0x9BC4, info), \
> > + INTEL_VGA_DEVICE(0x9BC5, info), \
> > INTEL_VGA_DEVICE(0x9BC6, info), \
> > + INTEL_VGA_DEVICE(0x9BC8, info), \
> > INTEL_VGA_DEVICE(0x9BE6, info), \
> > INTEL_VGA_DEVICE(0x9BF6, info)
> >
> > @@ -494,8 +497,8 @@
> > INTEL_VGA_DEVICE(0x3E9C, info)
> >
> > #define INTEL_CFL_H_GT2_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
> > - INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
> > + INTEL_VGA_DEVICE(0x3E94, info), /* Halo GT2 */ \
> > + INTEL_VGA_DEVICE(0x3E9B, info) /* Halo GT2 */
> >
> > /* CFL U GT2 */
> > #define INTEL_CFL_U_GT2_IDS(info) \
> > @@ -540,54 +543,57 @@
> >
> > /* CNL */
> > #define INTEL_CNL_PORT_F_IDS(info) \
> > - INTEL_VGA_DEVICE(0x5A54, info), \
> > - INTEL_VGA_DEVICE(0x5A5C, info), \
> > INTEL_VGA_DEVICE(0x5A44, info), \
> > - INTEL_VGA_DEVICE(0x5A4C, info)
> > + INTEL_VGA_DEVICE(0x5A4C, info), \
> > + INTEL_VGA_DEVICE(0x5A54, info), \
> > + INTEL_VGA_DEVICE(0x5A5C, info)
> >
> > #define INTEL_CNL_IDS(info) \
> > INTEL_CNL_PORT_F_IDS(info), \
> > - INTEL_VGA_DEVICE(0x5A51, info), \
> > - INTEL_VGA_DEVICE(0x5A59, info), \
> > + INTEL_VGA_DEVICE(0x5A40, info), \
> > INTEL_VGA_DEVICE(0x5A41, info), \
> > - INTEL_VGA_DEVICE(0x5A49, info), \
> > - INTEL_VGA_DEVICE(0x5A52, info), \
> > - INTEL_VGA_DEVICE(0x5A5A, info), \
> > INTEL_VGA_DEVICE(0x5A42, info), \
> > + INTEL_VGA_DEVICE(0x5A49, info), \
> > INTEL_VGA_DEVICE(0x5A4A, info), \
> > INTEL_VGA_DEVICE(0x5A50, info), \
> > - INTEL_VGA_DEVICE(0x5A40, info)
> > + INTEL_VGA_DEVICE(0x5A51, info), \
> > + INTEL_VGA_DEVICE(0x5A52, info), \
> > + INTEL_VGA_DEVICE(0x5A59, info), \
> > + INTEL_VGA_DEVICE(0x5A5A, info)
> >
> > /* ICL */
> > #define INTEL_ICL_PORT_F_IDS(info) \
> > INTEL_VGA_DEVICE(0x8A50, info), \
> > - INTEL_VGA_DEVICE(0x8A5C, info), \
> > - INTEL_VGA_DEVICE(0x8A59, info), \
> > - INTEL_VGA_DEVICE(0x8A58, info), \
> > INTEL_VGA_DEVICE(0x8A52, info), \
> > + INTEL_VGA_DEVICE(0x8A53, info), \
> > + INTEL_VGA_DEVICE(0x8A54, info), \
> > + INTEL_VGA_DEVICE(0x8A56, info), \
> > + INTEL_VGA_DEVICE(0x8A57, info), \
> > + INTEL_VGA_DEVICE(0x8A58, info), \
> > + INTEL_VGA_DEVICE(0x8A59, info), \
> > INTEL_VGA_DEVICE(0x8A5A, info), \
> > INTEL_VGA_DEVICE(0x8A5B, info), \
> > - INTEL_VGA_DEVICE(0x8A57, info), \
> > - INTEL_VGA_DEVICE(0x8A56, info), \
> > - INTEL_VGA_DEVICE(0x8A71, info), \
> > + INTEL_VGA_DEVICE(0x8A5C, info), \
> > INTEL_VGA_DEVICE(0x8A70, info), \
> > - INTEL_VGA_DEVICE(0x8A53, info), \
> > - INTEL_VGA_DEVICE(0x8A54, info)
> > + INTEL_VGA_DEVICE(0x8A71, info)
> >
> > #define INTEL_ICL_11_IDS(info) \
> > INTEL_ICL_PORT_F_IDS(info), \
> > INTEL_VGA_DEVICE(0x8A51, info), \
> > INTEL_VGA_DEVICE(0x8A5D, info)
> >
> > -/* EHL/JSL */
> > +/* EHL */
> > #define INTEL_EHL_IDS(info) \
> > INTEL_VGA_DEVICE(0x4500, info), \
> > INTEL_VGA_DEVICE(0x4571, info), \
> > INTEL_VGA_DEVICE(0x4551, info), \
> > INTEL_VGA_DEVICE(0x4541, info), \
> > - INTEL_VGA_DEVICE(0x4E71, info), \
> > INTEL_VGA_DEVICE(0x4557, info), \
> > - INTEL_VGA_DEVICE(0x4555, info), \
> > + INTEL_VGA_DEVICE(0x4555, info)
> > +
> > +/* JSL */
> > +#define INTEL_JSL_IDS(info) \
> > + INTEL_VGA_DEVICE(0x4E71, info), \
> > INTEL_VGA_DEVICE(0x4E61, info), \
> > INTEL_VGA_DEVICE(0x4E57, info), \
> > INTEL_VGA_DEVICE(0x4E55, info), \
> > @@ -624,6 +630,9 @@
> >
> > /* DG1 */
> > #define INTEL_DG1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x4905, info)
> > + INTEL_VGA_DEVICE(0x4905, info), \
> > + INTEL_VGA_DEVICE(0x4906, info), \
> > + INTEL_VGA_DEVICE(0x4907, info), \
> > + INTEL_VGA_DEVICE(0x4908, info)
> >
> > #endif /* _I915_PCIIDS_H */
> > --
> > 2.26.2.108.g048abe1751
> >
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2020-10-23 8:03 ` Petri Latvala
@ 2020-10-23 15:55 ` Dixit, Ashutosh
2020-10-26 8:30 ` Petri Latvala
0 siblings, 1 reply; 22+ messages in thread
From: Dixit, Ashutosh @ 2020-10-23 15:55 UTC (permalink / raw)
To: Petri Latvala; +Cc: igt-dev
On Fri, 23 Oct 2020 01:03:24 -0700, Petri Latvala wrote:
>
> On Fri, Oct 23, 2020 at 10:59:27AM +0300, Petri Latvala wrote:
> > On Thu, Oct 22, 2020 at 08:18:59PM -0700, Ashutosh Dixit wrote:
> > > Align with kernel commits:
> > >
> > > 605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
> > > 514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
> > > 32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
> > > df3478af1d73c ("drm/i915: Sort CML PCI IDs")
> > > cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
> > > b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
> > > 9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
> > > 79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
> > > cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
> > > 03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
> > > 812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
> > > 194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
> > > 82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
> > > 24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
> > > b50b7991b739c ("drm/i915/dg1: add more PCI ids")
> > >
> > > Cc: Petri Latvala <petri.latvala@intel.com>
> > > Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> > > ---
> >
> > I get really confused by commit messages like this. Which commit is
> > this now copied from, and which repo has that commit?
Hi Petri, yes I wasn't happy either doing this since it appears a simple
commit message like "Sync i915_pciids.h with the drm-tip kernel as of
today" should have been sufficient. But the previous git log for the file
has followed this format for the commit message. The format is the same as
that for "git log --oneline" for include/drm/i915_pciids.h on drm-tip,
newest commits on top.
But yes, I should have said it's the drm-tip kernel.
> Regardless of that confusion, the file matches what's in drm-tip so
>
> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Thanks.
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2020-10-23 15:55 ` Dixit, Ashutosh
@ 2020-10-26 8:30 ` Petri Latvala
0 siblings, 0 replies; 22+ messages in thread
From: Petri Latvala @ 2020-10-26 8:30 UTC (permalink / raw)
To: Dixit, Ashutosh; +Cc: igt-dev
On Fri, Oct 23, 2020 at 08:55:58AM -0700, Dixit, Ashutosh wrote:
> On Fri, 23 Oct 2020 01:03:24 -0700, Petri Latvala wrote:
> >
> > On Fri, Oct 23, 2020 at 10:59:27AM +0300, Petri Latvala wrote:
> > > On Thu, Oct 22, 2020 at 08:18:59PM -0700, Ashutosh Dixit wrote:
> > > > Align with kernel commits:
> > > >
> > > > 605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
> > > > 514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
> > > > 32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
> > > > df3478af1d73c ("drm/i915: Sort CML PCI IDs")
> > > > cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
> > > > b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
> > > > 9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
> > > > 79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
> > > > cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
> > > > 03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
> > > > 812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
> > > > 194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
> > > > 82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
> > > > 24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
> > > > b50b7991b739c ("drm/i915/dg1: add more PCI ids")
> > > >
> > > > Cc: Petri Latvala <petri.latvala@intel.com>
> > > > Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> > > > ---
> > >
> > > I get really confused by commit messages like this. Which commit is
> > > this now copied from, and which repo has that commit?
>
> Hi Petri, yes I wasn't happy either doing this since it appears a simple
> commit message like "Sync i915_pciids.h with the drm-tip kernel as of
> today" should have been sufficient. But the previous git log for the file
> has followed this format for the commit message. The format is the same as
> that for "git log --oneline" for include/drm/i915_pciids.h on drm-tip,
> newest commits on top.
>
> But yes, I should have said it's the drm-tip kernel.
The main thing I'm looking for is if this version of the header is in
drm-next already or is it only in dinq. Not a dealbreaker, but useful
information.
--
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2020-10-23 1:05 Ashutosh Dixit
0 siblings, 0 replies; 22+ messages in thread
From: Ashutosh Dixit @ 2020-10-23 1:05 UTC (permalink / raw)
To: igt-dev; +Cc: petri.latvala
Align with kernel commits:
605f9c290c1a2 ("drm/i915: Sort ICL PCI IDs")
514dc424ce4f5 ("drm/i915: Sort CNL PCI IDs")
32d4ec9a1681d ("drm/i915: Sort CFL PCI IDs")
df3478af1d73c ("drm/i915: Sort CML PCI IDs")
cd988984cbea0 ("drm/i915: Sort KBL PCI IDs")
b04d36f737712 ("drm/i915: Sort SKL PCI IDs")
9c0b2d30441b5 ("drm/i915: Sort HSW PCI IDs")
79033a0a78984 ("drm/i915: Ocd the HSW PCI ID hex numbers")
cfb3db8fdae25 ("drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments")
03e399020cd20 ("drm/i915: Add SKL GT1.5 PCI IDs")
812f044df08cc ("drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT")
194909a32aed0 ("drm/i915: Reclassify SKL 0x192a as GT3")
82e84284ab7dd ("drm/i915: Update Haswell PCI IDs")
24ea098b7c0d8 ("drm/i915/jsl: Split EHL/JSL platform info and PCI ids")
b50b7991b739c ("drm/i915/dg1: add more PCI ids")
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/i915_pciids.h | 141 ++++++++++++++++++++++++----------------------
1 file changed, 75 insertions(+), 66 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 7eeecb07c9..3b5ed1e4f3 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -170,9 +170,9 @@
#define INTEL_HSW_ULT_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
- INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0A06, info) /* ULT GT1 mobile */
+ INTEL_VGA_DEVICE(0x0A0B, info) /* ULT GT1 reserved */
#define INTEL_HSW_ULX_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */
@@ -181,26 +181,26 @@
INTEL_HSW_ULT_GT1_IDS(info), \
INTEL_HSW_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
- INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
+ INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
+ INTEL_VGA_DEVICE(0x040A, info), /* GT1 server */ \
INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \
INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
+ INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \
INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
- INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
- INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */
+ INTEL_VGA_DEVICE(0x0D0E, info) /* CRW GT1 reserved */
#define INTEL_HSW_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
- INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0A16, info) /* ULT GT2 mobile */
+ INTEL_VGA_DEVICE(0x0A1B, info) /* ULT GT2 reserved */ \
#define INTEL_HSW_ULX_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \
@@ -209,45 +209,45 @@
INTEL_HSW_ULT_GT2_IDS(info), \
INTEL_HSW_ULX_GT2_IDS(info), \
INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
- INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
+ INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
+ INTEL_VGA_DEVICE(0x041A, info), /* GT2 server */ \
INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \
INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
+ INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
- INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
- INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */
+ INTEL_VGA_DEVICE(0x0D1E, info) /* CRW GT2 reserved */
#define INTEL_HSW_ULT_GT3_IDS(info) \
INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
INTEL_VGA_DEVICE(0x0A2E, info) /* ULT GT3 reserved */
#define INTEL_HSW_GT3_IDS(info) \
INTEL_HSW_ULT_GT3_IDS(info), \
INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
- INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
+ INTEL_VGA_DEVICE(0x0426, info), /* GT3 mobile */ \
+ INTEL_VGA_DEVICE(0x042A, info), /* GT3 server */ \
INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
+ INTEL_VGA_DEVICE(0x0D26, info), /* CRW GT3 mobile */ \
INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
- INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
- INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */
+ INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */
#define INTEL_HSW_IDS(info) \
INTEL_HSW_GT1_IDS(info), \
@@ -329,17 +329,20 @@
INTEL_VGA_DEVICE(0x22b3, info)
#define INTEL_SKL_ULT_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */
+ INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
+ INTEL_VGA_DEVICE(0x1913, info) /* ULT GT1.5 */
#define INTEL_SKL_ULX_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */
+ INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
+ INTEL_VGA_DEVICE(0x1915, info) /* ULX GT1.5 */
#define INTEL_SKL_GT1_IDS(info) \
INTEL_SKL_ULT_GT1_IDS(info), \
INTEL_SKL_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \
+ INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
+ INTEL_VGA_DEVICE(0x1917, info) /* DT GT1.5 */
#define INTEL_SKL_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
@@ -352,26 +355,26 @@
INTEL_SKL_ULT_GT2_IDS(info), \
INTEL_SKL_ULX_GT2_IDS(info), \
INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \
- INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
#define INTEL_SKL_ULT_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */
+ INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
+ INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3e */ \
+ INTEL_VGA_DEVICE(0x1927, info) /* ULT GT3e */
#define INTEL_SKL_GT3_IDS(info) \
INTEL_SKL_ULT_GT3_IDS(info), \
- INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
- INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
- INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
- INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */
+ INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
+ INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3e */ \
+ INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3e */
#define INTEL_SKL_GT4_IDS(info) \
INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
- INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
- INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
- INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
- INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */
+ INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
+ INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
+ INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
#define INTEL_SKL_IDS(info) \
INTEL_SKL_GT1_IDS(info), \
@@ -403,8 +406,8 @@
INTEL_KBL_ULX_GT1_IDS(info), \
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
- INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
+ INTEL_VGA_DEVICE(0x590A, info), /* SRV GT1 */ \
+ INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
#define INTEL_KBL_ULT_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
@@ -416,10 +419,10 @@
#define INTEL_KBL_GT2_IDS(info) \
INTEL_KBL_ULT_GT2_IDS(info), \
INTEL_KBL_ULX_GT2_IDS(info), \
- INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
- INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
+ INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
#define INTEL_KBL_ULT_GT3_IDS(info) \
@@ -444,10 +447,10 @@
/* CML GT1 */
#define INTEL_CML_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x9BA5, info), \
- INTEL_VGA_DEVICE(0x9BA8, info), \
+ INTEL_VGA_DEVICE(0x9BA2, info), \
INTEL_VGA_DEVICE(0x9BA4, info), \
- INTEL_VGA_DEVICE(0x9BA2, info)
+ INTEL_VGA_DEVICE(0x9BA5, info), \
+ INTEL_VGA_DEVICE(0x9BA8, info)
#define INTEL_CML_U_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x9B21, info), \
@@ -456,11 +459,11 @@
/* CML GT2 */
#define INTEL_CML_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x9BC5, info), \
- INTEL_VGA_DEVICE(0x9BC8, info), \
- INTEL_VGA_DEVICE(0x9BC4, info), \
INTEL_VGA_DEVICE(0x9BC2, info), \
+ INTEL_VGA_DEVICE(0x9BC4, info), \
+ INTEL_VGA_DEVICE(0x9BC5, info), \
INTEL_VGA_DEVICE(0x9BC6, info), \
+ INTEL_VGA_DEVICE(0x9BC8, info), \
INTEL_VGA_DEVICE(0x9BE6, info), \
INTEL_VGA_DEVICE(0x9BF6, info)
@@ -494,8 +497,8 @@
INTEL_VGA_DEVICE(0x3E9C, info)
#define INTEL_CFL_H_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
- INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
+ INTEL_VGA_DEVICE(0x3E94, info), /* Halo GT2 */ \
+ INTEL_VGA_DEVICE(0x3E9B, info) /* Halo GT2 */
/* CFL U GT2 */
#define INTEL_CFL_U_GT2_IDS(info) \
@@ -540,54 +543,57 @@
/* CNL */
#define INTEL_CNL_PORT_F_IDS(info) \
- INTEL_VGA_DEVICE(0x5A54, info), \
- INTEL_VGA_DEVICE(0x5A5C, info), \
INTEL_VGA_DEVICE(0x5A44, info), \
- INTEL_VGA_DEVICE(0x5A4C, info)
+ INTEL_VGA_DEVICE(0x5A4C, info), \
+ INTEL_VGA_DEVICE(0x5A54, info), \
+ INTEL_VGA_DEVICE(0x5A5C, info)
#define INTEL_CNL_IDS(info) \
INTEL_CNL_PORT_F_IDS(info), \
- INTEL_VGA_DEVICE(0x5A51, info), \
- INTEL_VGA_DEVICE(0x5A59, info), \
+ INTEL_VGA_DEVICE(0x5A40, info), \
INTEL_VGA_DEVICE(0x5A41, info), \
- INTEL_VGA_DEVICE(0x5A49, info), \
- INTEL_VGA_DEVICE(0x5A52, info), \
- INTEL_VGA_DEVICE(0x5A5A, info), \
INTEL_VGA_DEVICE(0x5A42, info), \
+ INTEL_VGA_DEVICE(0x5A49, info), \
INTEL_VGA_DEVICE(0x5A4A, info), \
INTEL_VGA_DEVICE(0x5A50, info), \
- INTEL_VGA_DEVICE(0x5A40, info)
+ INTEL_VGA_DEVICE(0x5A51, info), \
+ INTEL_VGA_DEVICE(0x5A52, info), \
+ INTEL_VGA_DEVICE(0x5A59, info), \
+ INTEL_VGA_DEVICE(0x5A5A, info)
/* ICL */
#define INTEL_ICL_PORT_F_IDS(info) \
INTEL_VGA_DEVICE(0x8A50, info), \
- INTEL_VGA_DEVICE(0x8A5C, info), \
- INTEL_VGA_DEVICE(0x8A59, info), \
- INTEL_VGA_DEVICE(0x8A58, info), \
INTEL_VGA_DEVICE(0x8A52, info), \
+ INTEL_VGA_DEVICE(0x8A53, info), \
+ INTEL_VGA_DEVICE(0x8A54, info), \
+ INTEL_VGA_DEVICE(0x8A56, info), \
+ INTEL_VGA_DEVICE(0x8A57, info), \
+ INTEL_VGA_DEVICE(0x8A58, info), \
+ INTEL_VGA_DEVICE(0x8A59, info), \
INTEL_VGA_DEVICE(0x8A5A, info), \
INTEL_VGA_DEVICE(0x8A5B, info), \
- INTEL_VGA_DEVICE(0x8A57, info), \
- INTEL_VGA_DEVICE(0x8A56, info), \
- INTEL_VGA_DEVICE(0x8A71, info), \
+ INTEL_VGA_DEVICE(0x8A5C, info), \
INTEL_VGA_DEVICE(0x8A70, info), \
- INTEL_VGA_DEVICE(0x8A53, info), \
- INTEL_VGA_DEVICE(0x8A54, info)
+ INTEL_VGA_DEVICE(0x8A71, info)
#define INTEL_ICL_11_IDS(info) \
INTEL_ICL_PORT_F_IDS(info), \
INTEL_VGA_DEVICE(0x8A51, info), \
INTEL_VGA_DEVICE(0x8A5D, info)
-/* EHL/JSL */
+/* EHL */
#define INTEL_EHL_IDS(info) \
INTEL_VGA_DEVICE(0x4500, info), \
INTEL_VGA_DEVICE(0x4571, info), \
INTEL_VGA_DEVICE(0x4551, info), \
INTEL_VGA_DEVICE(0x4541, info), \
- INTEL_VGA_DEVICE(0x4E71, info), \
INTEL_VGA_DEVICE(0x4557, info), \
- INTEL_VGA_DEVICE(0x4555, info), \
+ INTEL_VGA_DEVICE(0x4555, info)
+
+/* JSL */
+#define INTEL_JSL_IDS(info) \
+ INTEL_VGA_DEVICE(0x4E71, info), \
INTEL_VGA_DEVICE(0x4E61, info), \
INTEL_VGA_DEVICE(0x4E57, info), \
INTEL_VGA_DEVICE(0x4E55, info), \
@@ -624,6 +630,9 @@
/* DG1 */
#define INTEL_DG1_IDS(info) \
- INTEL_VGA_DEVICE(0x4905, info)
+ INTEL_VGA_DEVICE(0x4905, info), \
+ INTEL_VGA_DEVICE(0x4906, info), \
+ INTEL_VGA_DEVICE(0x4907, info), \
+ INTEL_VGA_DEVICE(0x4908, info)
#endif /* _I915_PCIIDS_H */
--
2.26.2.108.g048abe1751
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 22+ messages in thread* [igt-dev] [PATCH i-g-t] lib: Sync i915_pciids.h with kernel
@ 2020-03-20 0:13 Swathi Dhanavanthri
2020-03-25 20:48 ` Matt Roper
0 siblings, 1 reply; 22+ messages in thread
From: Swathi Dhanavanthri @ 2020-03-20 0:13 UTC (permalink / raw)
To: igt-dev
Changes:
91b79fb35d67 ("drm/i915/tgl: Add new PCI IDs to TGL")
Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
---
lib/i915_pciids.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 3e26a917..753f97b5 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -591,12 +591,16 @@
/* TGL */
#define INTEL_TGL_12_IDS(info) \
- INTEL_VGA_DEVICE(0x9A49, info), \
INTEL_VGA_DEVICE(0x9A40, info), \
+ INTEL_VGA_DEVICE(0x9A49, info), \
INTEL_VGA_DEVICE(0x9A59, info), \
INTEL_VGA_DEVICE(0x9A60, info), \
INTEL_VGA_DEVICE(0x9A68, info), \
INTEL_VGA_DEVICE(0x9A70, info), \
- INTEL_VGA_DEVICE(0x9A78, info)
+ INTEL_VGA_DEVICE(0x9A78, info), \
+ INTEL_VGA_DEVICE(0x9AC0, info), \
+ INTEL_VGA_DEVICE(0x9AC9, info), \
+ INTEL_VGA_DEVICE(0x9AD9, info), \
+ INTEL_VGA_DEVICE(0x9AF8, info)
#endif /* _I915_PCIIDS_H */
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: Sync i915_pciids.h with kernel
2020-03-20 0:13 [igt-dev] [PATCH i-g-t] lib: Sync " Swathi Dhanavanthri
@ 2020-03-25 20:48 ` Matt Roper
0 siblings, 0 replies; 22+ messages in thread
From: Matt Roper @ 2020-03-25 20:48 UTC (permalink / raw)
To: Swathi Dhanavanthri; +Cc: igt-dev
On Thu, Mar 19, 2020 at 05:13:19PM -0700, Swathi Dhanavanthri wrote:
> Changes:
> 91b79fb35d67 ("drm/i915/tgl: Add new PCI IDs to TGL")
I'm not sure if this is the right commit ID. I see that kernel commit
as commit 3882581753d1 ("drm/i915/tgl: Add new PCI IDs to TGL").
You might also want to be slightly more verbose in the commit message
(e.g., instead of just saying "Changes:" say something like "Synchronize
with kernel headers as of commit XXX").
It looks like there's some restructuring of the CML device ID's that
exists in the kernel's copy of i915_pciids.h that still isn't present in
IGT. Usually we just copy the entire file from the kernel source tree
into the IGT source tree to make sure we've picked up all the latest
changes for all platforms.
Matt
>
> Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
> ---
> lib/i915_pciids.h | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 3e26a917..753f97b5 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -591,12 +591,16 @@
>
> /* TGL */
> #define INTEL_TGL_12_IDS(info) \
> - INTEL_VGA_DEVICE(0x9A49, info), \
> INTEL_VGA_DEVICE(0x9A40, info), \
> + INTEL_VGA_DEVICE(0x9A49, info), \
> INTEL_VGA_DEVICE(0x9A59, info), \
> INTEL_VGA_DEVICE(0x9A60, info), \
> INTEL_VGA_DEVICE(0x9A68, info), \
> INTEL_VGA_DEVICE(0x9A70, info), \
> - INTEL_VGA_DEVICE(0x9A78, info)
> + INTEL_VGA_DEVICE(0x9A78, info), \
> + INTEL_VGA_DEVICE(0x9AC0, info), \
> + INTEL_VGA_DEVICE(0x9AC9, info), \
> + INTEL_VGA_DEVICE(0x9AD9, info), \
> + INTEL_VGA_DEVICE(0x9AF8, info)
>
> #endif /* _I915_PCIIDS_H */
> --
> 2.20.1
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync i915_pciids.h with kernel
@ 2018-10-12 21:39 Souza, Jose
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
0 siblings, 1 reply; 22+ messages in thread
From: Souza, Jose @ 2018-10-12 21:39 UTC (permalink / raw)
To: igt-dev, Vivi, Rodrigo
On Fri, 2018-10-12 at 20:38 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: lib: sync i915_pciids.h with kernel
> URL : https://patchwork.freedesktop.org/series/50957/
> State : failure
>
> == Summary ==
>
> IGT patchset build failed on latest successful build
> 93871c6fb3c25e5d350c9faf36ded917174214de Add TODO.rst
>
> INTEL_CFL_S_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:348:2:
> INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> {
Because of the rename and addition of other AML grop we need to sync
intel_device_info.c too
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ninja: build stopped: subcommand failed.
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 21:39 [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync " Souza, Jose
@ 2018-10-12 22:40 ` Rodrigo Vivi
2018-10-12 23:16 ` Souza, Jose
0 siblings, 1 reply; 22+ messages in thread
From: Rodrigo Vivi @ 2018-10-12 22:40 UTC (permalink / raw)
To: igt-dev; +Cc: Rodrigo Vivi
One more AML ID added and WHL IDs reorganized.
Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
Redefine some Whiskey Lake SKUs")
v2: Also sync intel_device_info.c (CI and Jose)
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/i915_pciids.h | 21 +++++++++++++--------
lib/intel_device_info.c | 3 ++-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index fd965ffb..19266714 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -365,16 +365,20 @@
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
/* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x87CA, info)
+
#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_AML_GT2_IDS(info)
+ INTEL_AML_KBL_GT2_IDS(info)
/* CFL S */
#define INTEL_CFL_S_GT1_IDS(info) \
@@ -407,17 +411,17 @@
/* WHL/CFL U GT1 */
#define INTEL_WHL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info)
+ INTEL_VGA_DEVICE(0x3EA1, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
/* WHL/CFL U GT2 */
#define INTEL_WHL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info)
+ INTEL_VGA_DEVICE(0x3EA0, info), \
+ INTEL_VGA_DEVICE(0x3EA3, 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)
+ INTEL_VGA_DEVICE(0x3EA2, info)
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
@@ -427,7 +431,8 @@
INTEL_CFL_U_GT3_IDS(info), \
INTEL_WHL_U_GT1_IDS(info), \
INTEL_WHL_U_GT2_IDS(info), \
- INTEL_WHL_U_GT3_IDS(info)
+ INTEL_WHL_U_GT3_IDS(info), \
+ INTEL_AML_CFL_GT2_IDS(info)
/* CNL */
#define INTEL_CNL_IDS(info) \
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 5233be21..076168bf 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -345,7 +345,7 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
- INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
+ INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
INTEL_GLK_IDS(&intel_geminilake_info),
@@ -357,6 +357,7 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
+ INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CNL_IDS(&intel_cannonlake_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] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
@ 2018-10-12 23:16 ` Souza, Jose
2018-10-15 16:02 ` Rodrigo Vivi
0 siblings, 1 reply; 22+ messages in thread
From: Souza, Jose @ 2018-10-12 23:16 UTC (permalink / raw)
To: Vivi, Rodrigo, igt-dev
On Fri, 2018-10-12 at 15:40 -0700, Rodrigo Vivi wrote:
> One more AML ID added and WHL IDs reorganized.
>
> Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
> Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
> Redefine some Whiskey Lake SKUs")
>
> v2: Also sync intel_device_info.c (CI and Jose)
>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> lib/i915_pciids.h | 21 +++++++++++++--------
> lib/intel_device_info.c | 3 ++-
> 2 files changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index fd965ffb..19266714 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -365,16 +365,20 @@
> INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
>
> /* AML/KBL Y GT2 */
> -#define INTEL_AML_GT2_IDS(info) \
> +#define INTEL_AML_KBL_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
> INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
>
> +/* AML/CFL Y GT2 */
> +#define INTEL_AML_CFL_GT2_IDS(info) \
> + INTEL_VGA_DEVICE(0x87CA, info)
> +
> #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_AML_GT2_IDS(info)
> + INTEL_AML_KBL_GT2_IDS(info)
>
> /* CFL S */
> #define INTEL_CFL_S_GT1_IDS(info) \
> @@ -407,17 +411,17 @@
>
> /* WHL/CFL U GT1 */
> #define INTEL_WHL_U_GT1_IDS(info) \
> - INTEL_VGA_DEVICE(0x3EA1, info)
> + INTEL_VGA_DEVICE(0x3EA1, info), \
> + INTEL_VGA_DEVICE(0x3EA4, info)
>
> /* WHL/CFL U GT2 */
> #define INTEL_WHL_U_GT2_IDS(info) \
> - INTEL_VGA_DEVICE(0x3EA0, info)
> + INTEL_VGA_DEVICE(0x3EA0, info), \
> + INTEL_VGA_DEVICE(0x3EA3, 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)
> + INTEL_VGA_DEVICE(0x3EA2, info)
>
> #define INTEL_CFL_IDS(info) \
> INTEL_CFL_S_GT1_IDS(info), \
> @@ -427,7 +431,8 @@
> INTEL_CFL_U_GT3_IDS(info), \
> INTEL_WHL_U_GT1_IDS(info), \
> INTEL_WHL_U_GT2_IDS(info), \
> - INTEL_WHL_U_GT3_IDS(info)
> + INTEL_WHL_U_GT3_IDS(info), \
> + INTEL_AML_CFL_GT2_IDS(info)
>
> /* CNL */
> #define INTEL_CNL_IDS(info) \
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 5233be21..076168bf 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -345,7 +345,7 @@ static const struct pci_id_match
> intel_device_match[] = {
> INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
> INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
> - INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> + INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
>
> INTEL_GLK_IDS(&intel_geminilake_info),
>
> @@ -357,6 +357,7 @@ static const struct pci_id_match
> intel_device_match[] = {
> INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> + INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
>
> INTEL_CNL_IDS(&intel_cannonlake_info),
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 23:16 ` Souza, Jose
@ 2018-10-15 16:02 ` Rodrigo Vivi
0 siblings, 0 replies; 22+ messages in thread
From: Rodrigo Vivi @ 2018-10-15 16:02 UTC (permalink / raw)
To: Souza, Jose; +Cc: igt-dev
On Fri, Oct 12, 2018 at 11:16:45PM +0000, Souza, Jose wrote:
> On Fri, 2018-10-12 at 15:40 -0700, Rodrigo Vivi wrote:
> > One more AML ID added and WHL IDs reorganized.
> >
> > Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
> > Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
> > Redefine some Whiskey Lake SKUs")
> >
> > v2: Also sync intel_device_info.c (CI and Jose)
> >
>
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
thanks!
pushed to ssh://git.freedesktop.org/git/xorg/app/intel-gpu-tools
since I couldn't find yet the gitlab and I noticed activity
on old git.
>
> > Cc: José Roberto de Souza <jose.souza@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > lib/i915_pciids.h | 21 +++++++++++++--------
> > lib/intel_device_info.c | 3 ++-
> > 2 files changed, 15 insertions(+), 9 deletions(-)
> >
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> > index fd965ffb..19266714 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -365,16 +365,20 @@
> > INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
> >
> > /* AML/KBL Y GT2 */
> > -#define INTEL_AML_GT2_IDS(info) \
> > +#define INTEL_AML_KBL_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
> > INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
> >
> > +/* AML/CFL Y GT2 */
> > +#define INTEL_AML_CFL_GT2_IDS(info) \
> > + INTEL_VGA_DEVICE(0x87CA, info)
> > +
> > #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_AML_GT2_IDS(info)
> > + INTEL_AML_KBL_GT2_IDS(info)
> >
> > /* CFL S */
> > #define INTEL_CFL_S_GT1_IDS(info) \
> > @@ -407,17 +411,17 @@
> >
> > /* WHL/CFL U GT1 */
> > #define INTEL_WHL_U_GT1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3EA1, info)
> > + INTEL_VGA_DEVICE(0x3EA1, info), \
> > + INTEL_VGA_DEVICE(0x3EA4, info)
> >
> > /* WHL/CFL U GT2 */
> > #define INTEL_WHL_U_GT2_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3EA0, info)
> > + INTEL_VGA_DEVICE(0x3EA0, info), \
> > + INTEL_VGA_DEVICE(0x3EA3, 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)
> > + INTEL_VGA_DEVICE(0x3EA2, info)
> >
> > #define INTEL_CFL_IDS(info) \
> > INTEL_CFL_S_GT1_IDS(info), \
> > @@ -427,7 +431,8 @@
> > INTEL_CFL_U_GT3_IDS(info), \
> > INTEL_WHL_U_GT1_IDS(info), \
> > INTEL_WHL_U_GT2_IDS(info), \
> > - INTEL_WHL_U_GT3_IDS(info)
> > + INTEL_WHL_U_GT3_IDS(info), \
> > + INTEL_AML_CFL_GT2_IDS(info)
> >
> > /* CNL */
> > #define INTEL_CNL_IDS(info) \
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 5233be21..076168bf 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -345,7 +345,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
> > INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
> > - INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> > + INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> >
> > INTEL_GLK_IDS(&intel_geminilake_info),
> >
> > @@ -357,6 +357,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> > INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
> > INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> > INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> > + INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
> >
> > INTEL_CNL_IDS(&intel_cannonlake_info),
> >
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 22+ messages in thread
* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2018-10-12 20:27 Rodrigo Vivi
0 siblings, 0 replies; 22+ messages in thread
From: Rodrigo Vivi @ 2018-10-12 20:27 UTC (permalink / raw)
To: igt-dev; +Cc: Rodrigo Vivi
One more AML ID added and WHL IDs reorganized.
Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
Redefine some Whiskey Lake SKUs")
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/i915_pciids.h | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index fd965ffb..19266714 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -365,16 +365,20 @@
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
/* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x87CA, info)
+
#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_AML_GT2_IDS(info)
+ INTEL_AML_KBL_GT2_IDS(info)
/* CFL S */
#define INTEL_CFL_S_GT1_IDS(info) \
@@ -407,17 +411,17 @@
/* WHL/CFL U GT1 */
#define INTEL_WHL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info)
+ INTEL_VGA_DEVICE(0x3EA1, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
/* WHL/CFL U GT2 */
#define INTEL_WHL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info)
+ INTEL_VGA_DEVICE(0x3EA0, info), \
+ INTEL_VGA_DEVICE(0x3EA3, 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)
+ INTEL_VGA_DEVICE(0x3EA2, info)
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
@@ -427,7 +431,8 @@
INTEL_CFL_U_GT3_IDS(info), \
INTEL_WHL_U_GT1_IDS(info), \
INTEL_WHL_U_GT2_IDS(info), \
- INTEL_WHL_U_GT3_IDS(info)
+ INTEL_WHL_U_GT3_IDS(info), \
+ INTEL_AML_CFL_GT2_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] 22+ messages in thread
end of thread, other threads:[~2022-07-27 4:35 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2019-02-02 8:46 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev3) Patchwork
2019-02-02 10:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-02-04 18:12 ` [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Lionel Landwerlin
2019-02-04 18:46 ` Souza, Jose
2019-02-04 18:47 ` Rodrigo Vivi
-- strict thread matches above, loose matches on Subject: below --
2022-07-27 4:34 Matt Roper
2021-06-03 14:31 Matt Roper
2021-06-03 15:05 ` James Ausmus
2021-06-03 18:58 ` Srivatsa, Anusha
2020-10-23 3:18 Ashutosh Dixit
2020-10-23 7:59 ` Petri Latvala
2020-10-23 8:03 ` Petri Latvala
2020-10-23 15:55 ` Dixit, Ashutosh
2020-10-26 8:30 ` Petri Latvala
2020-10-23 1:05 Ashutosh Dixit
2020-03-20 0:13 [igt-dev] [PATCH i-g-t] lib: Sync " Swathi Dhanavanthri
2020-03-25 20:48 ` Matt Roper
2018-10-12 21:39 [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync " Souza, Jose
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
2018-10-12 23:16 ` Souza, Jose
2018-10-15 16:02 ` Rodrigo Vivi
2018-10-12 20:27 Rodrigo Vivi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.