drm/i915/kbl: Remove unused Kabylake pci ids
Subsystems (2)
PATCH 1/2 drm/i915/kbl: Remove unused Kabylake pci ids
See Mesa commits: ebc5ccf and b2dae9f
--- drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +0 -1
@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = {INTEL_KBL_GT1_IDS (&intel_kabylake_gt1_info),INTEL_KBL_GT2_IDS (&intel_kabylake_gt2_info),INTEL_KBL_GT3_IDS (&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info),INTEL_CFL_S_GT1_IDS (&intel_coffeelake_gt1_info),INTEL_CFL_S_GT2_IDS (&intel_coffeelake_gt2_info), INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
include/drm/i915_pciids.h +2 -13
@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)#define INTEL_KBL_GT1_IDS (info) \ - INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ -INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ INTEL_VGA_DEVICE(0x5917, info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ -INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \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(0x590B, info) /* Halo GT1 */#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \
@@ -353,22 +348,16 @@INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ -INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */#define INTEL_KBL_GT3_IDS (info) \ - INTEL_VGA_DEVICE(0x5923, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5926, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ -#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define INTEL_KBL_IDS (info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT3_IDS(info)/* CFL S */ #define INTEL_CFL_S_GT1_IDS (info) \
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
See Mesa commit 9c588ff
--- include/drm/i915_pciids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/i915_pciids.h +1 -1
@@ -337,13 +337,13 @@ INTEL_VGA_DEVICE(0x3185, info)#define INTEL_KBL_GT1_IDS (info) \ - INTEL_VGA_DEVICE(0x5917, info),/* DT GT1.5 */ \ INTEL_VGA_DEVICE(0x5906, info),/* ULT GT1 */ \INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* Mobile GT2 */ \INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
See Mesa commit 9c588ff
--- include/drm/i915_pciids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/i915_pciids.h +1 -1
@@ -339,7 +339,6 @@#define INTEL_KBL_GT1_IDS (info) \ INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ -INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
@@ -349,6 +348,7 @@#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* Mobile GT2 */ \INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
Quoted 5 lines · Anuj Phogat
See Mesa commit 9c588ff
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>
Quoted 27 lines
--- include/drm/i915_pciids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/i915_pciids.h +1
-1@@ -339,7 +339,6 @@#define INTEL_KBL_GT1_IDS (info) \ INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ -INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \@@ -349,6 +348,7 @@#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* Mobile GT2 */ \INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \Signature · 1 line
2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
Quoted 9 lines · Rodrigo Vivi
Quoted 5 lines · Anuj Phogat
See Mesa commit 9c588ff
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>
Thanks Rodrigo. Can you push it for me?
Quoted 18 lines
Quoted 18 lines
--- include/drm/i915_pciids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/i915_pciids.h +0
-1@@ -339,7 +339,6 @@#define INTEL_KBL_GT1_IDS (info) \ INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ -INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \@@ -349,6 +348,7 @@
Quoted 9 lines
Quoted 9 lines
include/drm/i915_pciids.h +1
-1#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* Mobile GT2 */ \INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ --2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
Quoted 11 lines · Anuj Phogat
Quoted 9 lines · Rodrigo Vivi
Quoted 5 lines · Anuj Phogat
See Mesa commit 9c588ff
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>Thanks Rodrigo. Can you push it for me?
merged to dinq. Thanks for the patch and for organizing the ids acros the stack.
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
--- include/drm/i915_pciids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/i915_pciids.h +0
-1@@ -339,7 +339,6 @@#define INTEL_KBL_GT1_IDS (info) \ INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ -INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \@@ -349,6 +348,7 @@
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
include/drm/i915_pciids.h +1
-1#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* Mobile GT2 */ \INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ --2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids
In reply to Anuj Phogat== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids
URL : https://patchwork.freedesktop.org/series/30151/
State : success
== Summary ==
Series 30151v1 series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids
https://patchwork.freedesktop.org/api/1.0/series/30151/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215
Test kms_flip:
Subgroup basic-flip-vs-modeset:
skip -> PASS (fi-skl-x1585l) fdo#101781fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:449s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:456s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:377s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:532s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:269s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:510s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:502s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:494s fi-cfl-s total:289 pass:250 dwarn:4 dfail:0 fail:0 skip:35 time:458s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:448s fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:590s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:429s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:405s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:438s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:467s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:496s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:578s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:582s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:552s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:494s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s fi-skl-x1585l total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:503s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:563s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:423s
a06ff73a7522af231e77776d7948e4d8099558c6 drm-tip: 2017y-09m-11d-13h-31m-34s UTC integration manifest 6b0df78ec3a4 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5e07796a20208 drm/i915/kbl: Remove unused Kabylake pci ids
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5647/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 1 line · Anuj Phogat
See Mesa commits: ebc5ccf and b2dae9f
I believe we need to be in sync between multiple gfx stack components, but I don't believe we should remove ids.
In the past we had cases where we noticed a product group using a listed id to do a product and we just noticed the id after a user reported at fd.o.
For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long.
Also Xserver ids are nowadays in sync with Mesa ones and I believe some OSVs might take a while to upgrade the Xserver as well in case of a new found product with some "new" id.
For this reason I was always in favor of adding all possible reserved ids from the beginning.
And this approach worked well on BDW and SKL, where we've seeing later some reserved ids becoming real product and we didn't have to do any extra step.
For this same reason I believe the right solution is to
add those ids back to mesa instead of removing from kernel and libdrm.
Thanks,
Rodrigo.
Quoted 73 lines
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_pci.c +0
-1@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = {INTEL_KBL_GT1_IDS (&intel_kabylake_gt1_info),INTEL_KBL_GT2_IDS (&intel_kabylake_gt2_info),INTEL_KBL_GT3_IDS (&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info),INTEL_CFL_S_GT1_IDS (&intel_coffeelake_gt1_info),INTEL_CFL_S_GT2_IDS (&intel_coffeelake_gt2_info), INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),include/drm/i915_pciids.h +2
-13@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)#define INTEL_KBL_GT1_IDS (info) \ - INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ -INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ INTEL_VGA_DEVICE(0x5917, info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ -INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \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(0x590B, info) /* Halo GT1 */#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \@@ -353,22 +348,16 @@INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ -INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */#define INTEL_KBL_GT3_IDS (info) \ - INTEL_VGA_DEVICE(0x5923, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5926, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ -#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define INTEL_KBL_IDS (info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT3_IDS(info)/* CFL S */ #define INTEL_CFL_S_GT1_IDS (info) \Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Quoted 16 lines · Rodrigo Vivi
Quoted 1 line · Anuj Phogat
See Mesa commits: ebc5ccf and b2dae9f
I believe we need to be in sync between multiple gfx stack components, but I don't believe we should remove ids.
In the past we had cases where we noticed a product group using a listed id to do a product and we just noticed the id after a user reported at fd.o.
For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long.
Also Xserver ids are nowadays in sync with Mesa ones and I believe some OSVs might take a while to upgrade the Xserver as well in case of a new found product with some "new" id.
Quoted 9 lines
For this reason I was always in favor of adding all possible reserved ids from the beginning.
And this approach worked well on BDW and SKL, where we've seeing later some reserved ids becoming real product and we didn't have to do any extra step.
For this same reason I believe the right solution is to
add those ids back to mesa instead of removing from kernel and libdrm.
I'm fine with keeping the unused pci id's in Mesa tree and keep it uniform across multiple gfx stack components. I'll revert the Mesa patch.
Quoted 72 lines
Thanks,
Rodrigo.Quoted 69 lines
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_pci.c +0
-1@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = {INTEL_KBL_GT1_IDS (&intel_kabylake_gt1_info),INTEL_KBL_GT2_IDS (&intel_kabylake_gt2_info),INTEL_KBL_GT3_IDS (&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info),INTEL_CFL_S_GT1_IDS (&intel_coffeelake_gt1_info),INTEL_CFL_S_GT2_IDS (&intel_coffeelake_gt2_info), INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),include/drm/i915_pciids.h +2
-14@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)#define INTEL_KBL_GT1_IDS (info) \ - INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ -INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ INTEL_VGA_DEVICE(0x5917, info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ -INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \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(0x590B, info) /* Halo GT1 */#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \@@ -353,22 +348,16 @@INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ -INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */#define INTEL_KBL_GT3_IDS (info) \ - INTEL_VGA_DEVICE(0x5923, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5926, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ -#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define INTEL_KBL_IDS (info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT3_IDS(info)/* CFL S */ #define INTEL_CFL_S_GT1_IDS (info) \ --2.9.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu:
Quoted 11 lines · Anuj Phogat
Quoted 1 line
See Mesa commits: ebc5ccf and b2dae9f
I believe we need to be in sync between multiple gfx stack components,
but I don't believe we should remove ids.In the past we had cases where we noticed a product group using a listed
id to do a product and we just noticed the id after a user reported at fd.o.
On the other hand, don't we have the risk that someone is going to see that these IDs are unused for KBL and them repurpose them om some future non-KBL product?
Quoted 97 lines
For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long.
Also Xserver ids are nowadays in sync with Mesa ones and I believe some
OSVs might take a while to upgrade the Xserver as well in case of a new
found product with some "new" id.For this reason I was always in favor of adding all possible reserved ids from the
beginning.And this approach worked well on BDW and SKL, where we've seeing later some
reserved ids becoming real product and we didn't have to do any extra step.For this same reason I believe the right solution is to add those ids back to mesa instead of removing from kernel and libdrm.
Thanks,
Rodrigo.Quoted 71 lines
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>---
drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++-------------2 files changed, 2 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_pci.c +0
-1@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = { INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info), INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),include/drm/i915_pciids.h +0
-0@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)
#defineINTEL_KBL_GT1_IDS(info)\include/drm/i915_pciids.h +0
-2-INTEL_VGA_DEVICE (0x5913 , info),/* ULT GT1.5 */ \ - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \include/drm/i915_pciids.h +0
-1- INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \include/drm/i915_pciids.h +1
-3-INTEL_VGA_DEVICE (0x5908 , info),/* Halo GT1 */ \ -INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ -INTEL_VGA_DEVICE (0x590A , info)/* SRV GT1 */ + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
#defineINTEL_KBL_GT2_IDS(info)\
INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \include/drm/i915_pciids.h +0
-1@@ -353,22 +348,16 @@ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
INTEL_VGA_DEVICE(0x591D, info)/* WKS GT2 */
#defineINTEL_KBL_GT3_IDS(info)\include/drm/i915_pciids.h +0
-1- INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x5927, info)/* ULT GT3 */include/drm/i915_pciids.h +0
-3-#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define
INTEL_KBL_IDS(info)\
INTEL_KBL_GT1_IDS(info), \
INTEL_KBL_GT2_IDS(info), \include/drm/i915_pciids.h +1
-2-INTEL_KBL_GT3_IDS (info), \ -INTEL_KBL_GT4_IDS (info) +INTEL_KBL_GT3_IDS (info)
/* CFL S */
#defineINTEL_CFL_S_GT1_IDS(info)\
--
2.9.4
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 8 lines · Paulo Zanoni
Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu:
Quoted 7 lines · Anuj Phogat
Quoted 1 line
See Mesa commits: ebc5ccf and b2dae9f
I believe we need to be in sync between multiple gfx stack components,
but I don't believe we should remove ids.
Quoted 8 lines
Quoted 4 lines
In the past we had cases where we noticed a product group using a listed
id to do a product and we just noticed the id after a user reported at fd.o.On the other hand, don't we have the risk that someone is going to see that these IDs are unused for KBL and them repurpose them om some future non-KBL product?
There is only risk if the id was removed from Spec. But when that happens I'm in favor of removing from the components as well.
While it is listed there even without POR it is reserved.
Quoted 98 lines
Quoted 98 lines
For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long.
Also Xserver ids are nowadays in sync with Mesa ones and I believe some
OSVs might take a while to upgrade the Xserver as well in case of a new
found product with some "new" id.For this reason I was always in favor of adding all possible reserved ids from the
beginning.And this approach worked well on BDW and SKL, where we've seeing later some
reserved ids becoming real product and we didn't have to do any extra step.For this same reason I believe the right solution is to add those ids back to mesa instead of removing from kernel and libdrm.
Thanks,
Rodrigo.Quoted 71 lines
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>---
drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++-------------2 files changed, 2 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_pci.c +0
-1@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = { INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info), INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info), INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),include/drm/i915_pciids.h +0
-0@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)
#defineINTEL_KBL_GT1_IDS(info)\include/drm/i915_pciids.h +0
-2-INTEL_VGA_DEVICE (0x5913 , info),/* ULT GT1.5 */ \ - INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \include/drm/i915_pciids.h +0
-1- INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \include/drm/i915_pciids.h +1
-3-INTEL_VGA_DEVICE (0x5908 , info),/* Halo GT1 */ \ -INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ -INTEL_VGA_DEVICE (0x590A , info)/* SRV GT1 */ + INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */
#defineINTEL_KBL_GT2_IDS(info)\
INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \include/drm/i915_pciids.h +0
-1@@ -353,22 +348,16 @@ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
INTEL_VGA_DEVICE(0x591D, info)/* WKS GT2 */
#defineINTEL_KBL_GT3_IDS(info)\include/drm/i915_pciids.h +0
-1- INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x5927, info)/* ULT GT3 */include/drm/i915_pciids.h +0
-3-#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define
INTEL_KBL_IDS(info)\
INTEL_KBL_GT1_IDS(info), \
INTEL_KBL_GT2_IDS(info), \include/drm/i915_pciids.h +1
-2-INTEL_KBL_GT3_IDS (info), \ -INTEL_KBL_GT4_IDS (info) +INTEL_KBL_GT3_IDS (info)
/* CFL S */
#defineINTEL_CFL_S_GT1_IDS(info)\
--
2.9.4
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dropping this patch.
Quoted 14 lines · Rodrigo Vivi
Quoted 13 lines · Paulo Zanoni
Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu:
Quoted 11 lines · Anuj Phogat
Quoted 1 line
See Mesa commits: ebc5ccf and b2dae9f
I believe we need to be in sync between multiple gfx stack components,
but I don't believe we should remove ids.In the past we had cases where we noticed a product group using a listed
id to do a product and we just noticed the id after a user reported at fd.o.
Quoted 115 lines
Quoted 3 lines
On the other hand, don't we have the risk that someone is going to see that these IDs are unused for KBL and them repurpose them om some future non-KBL product?
There is only risk if the id was removed from Spec. But when that happens I'm in favor of removing from the components as well.
While it is listed there even without POR it is reserved.Quoted 107 lines
Quoted 107 lines
For us in kernel the cycle until that id gets into a stable release propagated to OSVs distros can be a bit long.
Also Xserver ids are nowadays in sync with Mesa ones and I believe some
OSVs might take a while to upgrade the Xserver as well in case of a new
found product with some "new" id.For this reason I was always in favor of adding all possible reserved ids from the
beginning.And this approach worked well on BDW and SKL, where we've seeing later some
reserved ids becoming real product and we didn't have to do any extra step.For this same reason I believe the right solution is to add those ids back to mesa instead of removing from kernel and libdrm.
Thanks,
Rodrigo.Quoted 71 lines
Cc Matt Turner <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anuj Phogat <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 - include/drm/i915_pciids.h | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_pci.c +0
-1@@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] = {INTEL_KBL_GT1_IDS (&intel_kabylake_gt1_info),INTEL_KBL_GT2_IDS (&intel_kabylake_gt2_info),INTEL_KBL_GT3_IDS (&intel_kabylake_gt3_info), -INTEL_KBL_GT4_IDS (&intel_kabylake_gt3_info),INTEL_CFL_S_GT1_IDS (&intel_coffeelake_gt1_info), INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),include/drm/i915_pciids.h +2
-14@@ -337,15 +337,10 @@ INTEL_VGA_DEVICE(0x3185, info)#define INTEL_KBL_GT1_IDS (info) \ - INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ -INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ INTEL_VGA_DEVICE(0x5917, info),/* DT GT1.5 */ \INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ -INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \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(0x590B, info) /* Halo GT1 */#define INTEL_KBL_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5916, info),/* ULT GT2 */ \@@ -353,22 +348,16 @@INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ -INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */#define INTEL_KBL_GT3_IDS (info) \ - INTEL_VGA_DEVICE(0x5923, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5926, info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ -#define INTEL_KBL_GT4_IDS (info) \ - INTEL_VGA_DEVICE(0x593B, info)/* Halo GT4 */ -#define INTEL_KBL_IDS (info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT3_IDS(info)/* CFL S */ #define INTEL_CFL_S_GT1_IDS (info) \ --2.9.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids
In reply to Anuj Phogat== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids
URL : https://patchwork.freedesktop.org/series/30151/
State : success
== Summary ==
Test kms_atomic_transition:
Subgroup plane-all-transition-nonblocking:
fail -> PASS (shard-hsw)shard-hsw total:2255 pass:1215 dwarn:0 dfail:0 fail:13 skip:1027 time:9225s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5647/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids (rev2)
In reply to Anuj Phogat== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids (rev2)
URL : https://patchwork.freedesktop.org/series/30151/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CC arch/x86/kernel/early-quirks.o
In file included from ./include/drm/i915_drm.h:29:0,
from arch/x86/kernel/early-quirks.c:19:
./include/drm/i915_pciids.h:38:36: error: expected identifier or ‘(’ before ‘{’ token
#define INTEL_VGA_DEVICE(id, info) { \
^./include/drm/i915_pciids.h:341:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
^~~~~~~~~~~~~~~~./include/drm/i915_pciids.h:341:32: error: expected identifier or ‘(’ before ‘,’ token
INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
^
./include/drm/i915_pciids.h:343:32: error: expected identifier or ‘(’ before ‘,’ token
INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
^
./include/drm/i915_pciids.h:344:32: error: expected identifier or ‘(’ before ‘,’ token
INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
^
./include/drm/i915_pciids.h:346:32: error: expected identifier or ‘(’ before ‘,’ token
INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
^
./include/drm/i915_pciids.h:347:32: error: expected identifier or ‘(’ before ‘,’ token
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
^./include/drm/i915_pciids.h:340:1: error: expected expression before ‘<<’ token
<<<<<<< HEAD
^./include/drm/i915_pciids.h:364:2: note: in expansion of macro ‘INTEL_KBL_GT1_IDS’
INTEL_KBL_GT1_IDS(info), \
^~~~~~~~~~~~~~~~~arch/x86/kernel/early-quirks.c:528:2: note: in expansion of macro ‘INTEL_KBL_IDS’
INTEL_KBL_IDS(&gen9_early_ops),
^~~~~~~~~~~~~scripts/Makefile.build:311: recipe for target 'arch/x86/kernel/early-quirks.o' failed make[2]: *** [arch/x86/kernel/early-quirks.o] Error 1 scripts/Makefile.build:570: recipe for target 'arch/x86/kernel' failed make[1]: *** [arch/x86/kernel] Error 2
Makefile:1019: recipe for target 'arch/x86' failed
make: *** [arch/x86] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx