x86/gpu: add CFL to early quirks
Subsystems (4)
PATCH v2 1/1 x86/gpu: add CFL to early quirks
CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map.
---
v2: improve commit message, add Fixes tag and CC stable
arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+)
arch/x86/kernel/early-quirks.c +1 -0
@@ -528,6 +528,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {INTEL_SKL_IDS (&gen9_early_ops),INTEL_BXT_IDS (&gen9_early_ops),INTEL_KBL_IDS (&gen9_early_ops), +INTEL_CFL_IDS (&gen9_early_ops),INTEL_GLK_IDS (&gen9_early_ops), INTEL_CNL_IDS(&gen9_early_ops), };
include/drm/i915_pciids.h +6 -0
@@ -392,6 +392,12 @@INTEL_VGA_DEVICE (0x3EA8 , info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x3EA5, info) /* ULT GT3 */ +#define INTEL_CFL_IDS (info) \ + INTEL_CFL_S_GT1_IDS(info), \ + INTEL_CFL_S_GT2_IDS(info), \ + INTEL_CFL_H_GT2_IDS(info), \ + INTEL_CFL_U_GT3_IDS(info) +/* CNL U 2+2 */ #define INTEL_CNL_U_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5A52, info), \
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for x86/gpu: add CFL to early quirks (rev2)
== Series Details ==
== Series Details ==
Series: x86/gpu: add CFL to early quirks (rev2)
URL : https://patchwork.freedesktop.org/series/35109/
State : success
== Summary ==
Series 35109v2 x86/gpu: add CFL to early quirks
https://patchwork.freedesktop.org/api/1.0/series/35109/revisions/2/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
incomplete -> PASS (fi-snb-2520m)
Test kms_chamelium:
Subgroup dp-crc-fast:
pass -> DMESG-FAIL (fi-kbl-7500u) fdo#103841
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-kbl-r) fdo#104172 +1
Subgroup suspend-read-crc-pipe-b:
notrun -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:439s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:442s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:382s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:507s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:502s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:506s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:483s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:470s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:270s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:536s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:413s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:413s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:387s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:479s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:434s fi-kbl-7500u total:288 pass:262 dwarn:1 dfail:1 fail:0 skip:24 time:486s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:519s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:469s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:530s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:590s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:449s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:539s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:445s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:412s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:603s fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:638s fi-glk-dsi total:98 pass:54 dwarn:0 dfail:1 fail:0 skip:42
e97b6bb4ff1a307c6b88435f2a629519f04d593b drm-tip: 2017y-12m-13d-19h-58m-44s UTC integration manifest 8d1ef03942ba x86/gpu: add CFL to early quirks
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7490/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for x86/gpu: add CFL to early quirks (rev2)
In reply to Lucas De Marchi== Series Details ==
== Series Details ==
Series: x86/gpu: add CFL to early quirks (rev2)
URL : https://patchwork.freedesktop.org/series/35109/
State : warning
== Summary ==
Test gem_softpin:
Subgroup noreloc-s4:
fail -> SKIP (shard-snb) fdo#103375 +2
Test pm_rc6_residency:
Subgroup rc6-accuracy:
pass -> SKIP (shard-snb)
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-b-planes:
skip -> PASS (shard-snb)
Test drv_suspend:
Subgroup debugfs-reader:
skip -> PASS (shard-hsw)
Test kms_flip:
Subgroup plain-flip-fb-recreate-interruptible:
pass -> FAIL (shard-hsw) fdo#100368
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2712 pass:1536 dwarn:1 dfail:0 fail:11 skip:1164 time:9439s shard-snb total:2712 pass:1308 dwarn:1 dfail:0 fail:10 skip:1393 time:8009s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7490/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Lucas De Marchi
CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map.
Quoted 16 lines
Fixes b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")Signed-off-by Lucas De Marchi <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc David Airlie <[email protected]>Cc Ingo Molnar <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Thomas Gleixner <[email protected]>Cc <[email protected]> # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_infoCc <[email protected]> # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5Cc <[email protected]> # v4.13+
Agreed on the Fixes: and Cc: stable here.
Quoted 38 lines
Reviewed-by Rodrigo Vivi <[email protected]>---
v2: improve commit message, add Fixes tag and CC stable
arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+)arch/x86/kernel/early-quirks.c +1
-0@@ -528,6 +528,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {INTEL_SKL_IDS (&gen9_early_ops),INTEL_BXT_IDS (&gen9_early_ops),INTEL_KBL_IDS (&gen9_early_ops), +INTEL_CFL_IDS (&gen9_early_ops),INTEL_GLK_IDS (&gen9_early_ops), INTEL_CNL_IDS(&gen9_early_ops), };include/drm/i915_pciids.h +6
-0@@ -392,6 +392,12 @@INTEL_VGA_DEVICE (0x3EA8 , info),/* ULT GT3 */ \ INTEL_VGA_DEVICE(0x3EA5, info) /* ULT GT3 */ +#define INTEL_CFL_IDS (info) \ + INTEL_CFL_S_GT1_IDS(info), \ + INTEL_CFL_S_GT2_IDS(info), \ + INTEL_CFL_H_GT2_IDS(info), \ + INTEL_CFL_U_GT3_IDS(info) +/* CNL U 2+2 */ #define INTEL_CNL_U_GT2_IDS (info) \ INTEL_VGA_DEVICE(0x5A52, info), \
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 22 lines · Lucas De Marchi
CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map.
Fixes b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")Signed-off-by Lucas De Marchi <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc David Airlie <[email protected]>Cc Ingo Molnar <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Thomas Gleixner <[email protected]>Cc <[email protected]> # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_infoCc <[email protected]> # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5Cc <[email protected]> # v4.13+Reviewed-by Rodrigo Vivi <[email protected]>
Quoted 7 lines
---
v2: improve commit message, add Fixes tag and CC stable
arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+)
Thanks,
Ingo
Rodrigo Vivi
AppliedQuoted 27 lines · Ingo Molnar
Quoted 24 lines · Lucas De Marchi
CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map.
Fixes b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")Signed-off-by Lucas De Marchi <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc David Airlie <[email protected]>Cc Ingo Molnar <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Thomas Gleixner <[email protected]>Cc <[email protected]> # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_infoCc <[email protected]> # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5Cc <[email protected]> # v4.13+Reviewed-by Rodrigo Vivi <[email protected]>---
Quoted 7 lines
Quoted 5 lines
v2: improve commit message, add Fixes tag and CC stable
arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+)Acked-by Ingo Molnar <[email protected]>
Merged to drm-intel-next-queued.
Thanks for the patches, suggestions and acks.
Quoted 4 lines
Thanks,
Ingo
Quoted 30 lines · Rodrigo Vivi
Quoted 29 lines · Ingo Molnar
Quoted 26 lines · Lucas De Marchi
CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map.
Fixes b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")Signed-off-by Lucas De Marchi <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc David Airlie <[email protected]>Cc Ingo Molnar <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Thomas Gleixner <[email protected]>Cc <[email protected]> # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_infoCc <[email protected]> # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5Cc <[email protected]> # v4.13+Reviewed-by Rodrigo Vivi <[email protected]>---
v2: improve commit message, add Fixes tag and CC stable
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+)Acked-by Ingo Molnar <[email protected]>Merged to drm-intel-next-queued.
Thanks for the patches, suggestions and acks.
Shouldn't this go to v4.15 as well, because CFL is enabled there? I don't see it in rc8.