| Message ID | 20190510140255.25215-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/icl: More workaround for port F detection due to broken VBTs | expand |
This fixes the issue on my ICL-Y. On Fri, 2019-05-10 at 17:02 +0300, Imre Deak wrote: > Add another ICL-Y PCIID that proved to have only 5 ports to the > corresponding PCIID list. > > Meanwhile I'm trying to get a complete list of all PCIIDs with less > than > 6 ports and/or get a VBT fix to mark these ports non-existant, but > until > then the only way is to go one-by-one. > > This fixes the following error on machines with less than 6 port: > > [drm:intel_power_well_enable [i915]] enabling AUX F > ------------[ cut here ]------------ > WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs- > >driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) > > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) > > Cc: Mika Kahola <mika.kahola@intel.com> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 > Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> > --- > include/drm/i915_pciids.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 6477da22af28..6d60ea68c171 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -559,7 +559,6 @@ > #define INTEL_ICL_PORT_F_IDS(info) \ > INTEL_VGA_DEVICE(0x8A50, 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), \ > @@ -573,7 +572,8 @@ > > #define INTEL_ICL_11_IDS(info) \ > INTEL_ICL_PORT_F_IDS(info), \ > - INTEL_VGA_DEVICE(0x8A51, info) > + INTEL_VGA_DEVICE(0x8A51, info), \ > + INTEL_VGA_DEVICE(0x8A5D, info) > > /* EHL */ > #define INTEL_EHL_IDS(info) \
On Fri, 10 May 2019, Imre Deak <imre.deak@intel.com> wrote: > Add another ICL-Y PCIID that proved to have only 5 ports to the > corresponding PCIID list. > > Meanwhile I'm trying to get a complete list of all PCIIDs with less than > 6 ports and/or get a VBT fix to mark these ports non-existant, but until > then the only way is to go one-by-one. > > This fixes the following error on machines with less than 6 port: > > [drm:intel_power_well_enable [i915]] enabling AUX F > ------------[ cut here ]------------ > WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) > > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) > > Cc: Mika Kahola <mika.kahola@intel.com> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 We've used Bugzilla: for bugs that the patch at hand fixes, and References: for other related links and stuff. Seems like the patch actually fixed the bug. BR, Jani. > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > include/drm/i915_pciids.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 6477da22af28..6d60ea68c171 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -559,7 +559,6 @@ > #define INTEL_ICL_PORT_F_IDS(info) \ > INTEL_VGA_DEVICE(0x8A50, 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), \ > @@ -573,7 +572,8 @@ > > #define INTEL_ICL_11_IDS(info) \ > INTEL_ICL_PORT_F_IDS(info), \ > - INTEL_VGA_DEVICE(0x8A51, info) > + INTEL_VGA_DEVICE(0x8A51, info), \ > + INTEL_VGA_DEVICE(0x8A5D, info) > > /* EHL */ > #define INTEL_EHL_IDS(info) \
On Mon, May 13, 2019 at 04:56:25PM +0300, Jani Nikula wrote: > On Fri, 10 May 2019, Imre Deak <imre.deak@intel.com> wrote: > > Add another ICL-Y PCIID that proved to have only 5 ports to the > > corresponding PCIID list. > > > > Meanwhile I'm trying to get a complete list of all PCIIDs with less than > > 6 ports and/or get a VBT fix to mark these ports non-existant, but until > > then the only way is to go one-by-one. > > > > This fixes the following error on machines with less than 6 port: > > > > [drm:intel_power_well_enable [i915]] enabling AUX F > > ------------[ cut here ]------------ > > WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) > > > > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) > > > > Cc: Mika Kahola <mika.kahola@intel.com> > > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 > > We've used Bugzilla: for bugs that the patch at hand fixes, and > References: for other related links and stuff. Seems like the patch > actually fixed the bug. Yes, it's a link to a related bug. It - unfortunately - does not fix the bug, since we don't know yet the full PCIID list for ICLs that have only 5 (or even less) ports. > > BR, > Jani. > > > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > --- > > include/drm/i915_pciids.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > > index 6477da22af28..6d60ea68c171 100644 > > --- a/include/drm/i915_pciids.h > > +++ b/include/drm/i915_pciids.h > > @@ -559,7 +559,6 @@ > > #define INTEL_ICL_PORT_F_IDS(info) \ > > INTEL_VGA_DEVICE(0x8A50, 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), \ > > @@ -573,7 +572,8 @@ > > > > #define INTEL_ICL_11_IDS(info) \ > > INTEL_ICL_PORT_F_IDS(info), \ > > - INTEL_VGA_DEVICE(0x8A51, info) > > + INTEL_VGA_DEVICE(0x8A51, info), \ > > + INTEL_VGA_DEVICE(0x8A5D, info) > > > > /* EHL */ > > #define INTEL_EHL_IDS(info) \ > > -- > Jani Nikula, Intel Open Source Graphics Center
On Mon, 13 May 2019, Imre Deak <imre.deak@intel.com> wrote: > On Mon, May 13, 2019 at 04:56:25PM +0300, Jani Nikula wrote: >> On Fri, 10 May 2019, Imre Deak <imre.deak@intel.com> wrote: >> > Add another ICL-Y PCIID that proved to have only 5 ports to the >> > corresponding PCIID list. >> > >> > Meanwhile I'm trying to get a complete list of all PCIIDs with less than >> > 6 ports and/or get a VBT fix to mark these ports non-existant, but until >> > then the only way is to go one-by-one. >> > >> > This fixes the following error on machines with less than 6 port: >> > >> > [drm:intel_power_well_enable [i915]] enabling AUX F >> > ------------[ cut here ]------------ >> > WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) >> > >> > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) >> > >> > Cc: Mika Kahola <mika.kahola@intel.com> >> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 >> >> We've used Bugzilla: for bugs that the patch at hand fixes, and >> References: for other related links and stuff. Seems like the patch >> actually fixed the bug. > > Yes, it's a link to a related bug. It - unfortunately - does not fix the > bug, since we don't know yet the full PCIID list for ICLs that have only > 5 (or even less) ports. Yet the bug was closed referencing this commit... BR, Jani. > >> >> BR, >> Jani. >> >> >> > Signed-off-by: Imre Deak <imre.deak@intel.com> >> > --- >> > include/drm/i915_pciids.h | 4 ++-- >> > 1 file changed, 2 insertions(+), 2 deletions(-) >> > >> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h >> > index 6477da22af28..6d60ea68c171 100644 >> > --- a/include/drm/i915_pciids.h >> > +++ b/include/drm/i915_pciids.h >> > @@ -559,7 +559,6 @@ >> > #define INTEL_ICL_PORT_F_IDS(info) \ >> > INTEL_VGA_DEVICE(0x8A50, 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), \ >> > @@ -573,7 +572,8 @@ >> > >> > #define INTEL_ICL_11_IDS(info) \ >> > INTEL_ICL_PORT_F_IDS(info), \ >> > - INTEL_VGA_DEVICE(0x8A51, info) >> > + INTEL_VGA_DEVICE(0x8A51, info), \ >> > + INTEL_VGA_DEVICE(0x8A5D, info) >> > >> > /* EHL */ >> > #define INTEL_EHL_IDS(info) \ >> >> -- >> Jani Nikula, Intel Open Source Graphics Center
On Tue, May 14, 2019 at 10:51:26AM +0300, Jani Nikula wrote: > On Mon, 13 May 2019, Imre Deak <imre.deak@intel.com> wrote: > > On Mon, May 13, 2019 at 04:56:25PM +0300, Jani Nikula wrote: > >> On Fri, 10 May 2019, Imre Deak <imre.deak@intel.com> wrote: > >> > Add another ICL-Y PCIID that proved to have only 5 ports to the > >> > corresponding PCIID list. > >> > > >> > Meanwhile I'm trying to get a complete list of all PCIIDs with less than > >> > 6 ports and/or get a VBT fix to mark these ports non-existant, but until > >> > then the only way is to go one-by-one. > >> > > >> > This fixes the following error on machines with less than 6 port: > >> > > >> > [drm:intel_power_well_enable [i915]] enabling AUX F > >> > ------------[ cut here ]------------ > >> > WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) > >> > > >> > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) > >> > > >> > Cc: Mika Kahola <mika.kahola@intel.com> > >> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 > >> > >> We've used Bugzilla: for bugs that the patch at hand fixes, and > >> References: for other related links and stuff. Seems like the patch > >> actually fixed the bug. > > > > Yes, it's a link to a related bug. It - unfortunately - does not fix the > > bug, since we don't know yet the full PCIID list for ICLs that have only > > 5 (or even less) ports. > > Yet the bug was closed referencing this commit... Yes, that was in the hope that by now (after months) we'd get a VBT fix.. I reopened the fdo bug now until we get the full list of PCIIDs, (or magic happens and the VBT gets fixed). Thanks, Imre > > BR, > Jani. > > > > > >> > >> BR, > >> Jani. > >> > >> > >> > Signed-off-by: Imre Deak <imre.deak@intel.com> > >> > --- > >> > include/drm/i915_pciids.h | 4 ++-- > >> > 1 file changed, 2 insertions(+), 2 deletions(-) > >> > > >> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > >> > index 6477da22af28..6d60ea68c171 100644 > >> > --- a/include/drm/i915_pciids.h > >> > +++ b/include/drm/i915_pciids.h > >> > @@ -559,7 +559,6 @@ > >> > #define INTEL_ICL_PORT_F_IDS(info) \ > >> > INTEL_VGA_DEVICE(0x8A50, 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), \ > >> > @@ -573,7 +572,8 @@ > >> > > >> > #define INTEL_ICL_11_IDS(info) \ > >> > INTEL_ICL_PORT_F_IDS(info), \ > >> > - INTEL_VGA_DEVICE(0x8A51, info) > >> > + INTEL_VGA_DEVICE(0x8A51, info), \ > >> > + INTEL_VGA_DEVICE(0x8A5D, info) > >> > > >> > /* EHL */ > >> > #define INTEL_EHL_IDS(info) \ > >> > >> -- > >> Jani Nikula, Intel Open Source Graphics Center > > -- > Jani Nikula, Intel Open Source Graphics Center
On Fri, May 10, 2019 at 05:34:35PM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/icl: More workaround for port F detection due to broken VBTs > URL : https://patchwork.freedesktop.org/series/60508/ > State : success Thanks for the testing and reviews, pushed to -dinq with Mika's t-b tag added. > > == Summary == > > CI Bug Log - changes from CI_DRM_6073_full -> Patchwork_13003_full > ==================================================== > > Summary > ------- > > **SUCCESS** > > No regressions found. > > > > Known issues > ------------ > > Here are the changes found in Patchwork_13003_full that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_eio@in-flight-10ms: > - shard-glk: ([PASS][1], [PASS][2]) -> [FAIL][3] ([fdo#105957]) > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-glk2/igt@gem_eio@in-flight-10ms.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-glk5/igt@gem_eio@in-flight-10ms.html > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-glk7/igt@gem_eio@in-flight-10ms.html > > * igt@i915_pm_rpm@basic-pci-d3-state: > - shard-skl: ([PASS][4], [PASS][5]) -> [INCOMPLETE][6] ([fdo#107807]) > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl1/igt@i915_pm_rpm@basic-pci-d3-state.html > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl2/igt@i915_pm_rpm@basic-pci-d3-state.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl2/igt@i915_pm_rpm@basic-pci-d3-state.html > > * igt@i915_pm_rpm@i2c: > - shard-iclb: [PASS][7] -> [DMESG-WARN][8] ([fdo#109982]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb5/igt@i915_pm_rpm@i2c.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb2/igt@i915_pm_rpm@i2c.html > > * igt@i915_pm_rpm@legacy-planes-dpms: > - shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#107807]) > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl5/igt@i915_pm_rpm@legacy-planes-dpms.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl1/igt@i915_pm_rpm@legacy-planes-dpms.html > > * igt@kms_dp_dsc@basic-dsc-enable-edp: > - shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109349]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb7/igt@kms_dp_dsc@basic-dsc-enable-edp.html > > * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: > - shard-glk: ([PASS][13], [PASS][14]) -> [FAIL][15] ([fdo#105363]) > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html > > * igt@kms_flip@2x-flip-vs-modeset-vs-hang: > - shard-hsw: ([PASS][16], [PASS][17]) -> [INCOMPLETE][18] ([fdo#103540]) > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw2/igt@kms_flip@2x-flip-vs-modeset-vs-hang.html > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw1/igt@kms_flip@2x-flip-vs-modeset-vs-hang.html > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-hsw7/igt@kms_flip@2x-flip-vs-modeset-vs-hang.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible: > - shard-skl: ([PASS][19], [PASS][20]) -> [FAIL][21] ([fdo#105363]) > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > > * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render: > - shard-iclb: [PASS][22] -> [FAIL][23] ([fdo#103167]) +1 similar issue > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html > > * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render: > - shard-iclb: ([PASS][24], [PASS][25]) -> [FAIL][26] ([fdo#103167]) +3 similar issues > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html > > * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes: > - shard-apl: ([PASS][27], [PASS][28]) -> [DMESG-WARN][29] ([fdo#108566]) +1 similar issue > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html > > * igt@kms_psr@psr2_primary_mmap_gtt: > - shard-iclb: [PASS][30] -> [SKIP][31] ([fdo#109441]) +2 similar issues > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb7/igt@kms_psr@psr2_primary_mmap_gtt.html > > > #### Possible fixes #### > > * igt@gem_tiled_swapping@non-threaded: > - shard-hsw: ([FAIL][32], [PASS][33]) ([fdo#108686]) -> [PASS][34] > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw4/igt@gem_tiled_swapping@non-threaded.html > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw6/igt@gem_tiled_swapping@non-threaded.html > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-hsw1/igt@gem_tiled_swapping@non-threaded.html > > * igt@i915_pm_rpm@reg-read-ioctl: > - shard-skl: ([PASS][35], [INCOMPLETE][36]) ([fdo#107807]) -> [PASS][37] > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl6/igt@i915_pm_rpm@reg-read-ioctl.html > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl1/igt@i915_pm_rpm@reg-read-ioctl.html > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl1/igt@i915_pm_rpm@reg-read-ioctl.html > > * igt@i915_suspend@debugfs-reader: > - shard-apl: ([DMESG-WARN][38], [PASS][39]) ([fdo#108566]) -> [PASS][40] +2 similar issues > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl4/igt@i915_suspend@debugfs-reader.html > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl8/igt@i915_suspend@debugfs-reader.html > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-apl5/igt@i915_suspend@debugfs-reader.html > > * igt@kms_cursor_crc@cursor-128x128-suspend: > - shard-apl: ([DMESG-WARN][41], [DMESG-WARN][42]) ([fdo#108566]) -> [PASS][43] > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl1/igt@kms_cursor_crc@cursor-128x128-suspend.html > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl8/igt@kms_cursor_crc@cursor-128x128-suspend.html > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-apl6/igt@kms_cursor_crc@cursor-128x128-suspend.html > > * igt@kms_cursor_crc@cursor-64x64-suspend: > - shard-skl: [INCOMPLETE][44] ([fdo#104108] / [fdo#107773]) -> [PASS][45] > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl9/igt@kms_cursor_crc@cursor-64x64-suspend.html > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl1/igt@kms_cursor_crc@cursor-64x64-suspend.html > > * igt@kms_cursor_legacy@cursor-vs-flip-atomic: > - shard-hsw: ([PASS][46], [INCOMPLETE][47]) ([fdo#103540]) -> [PASS][48] > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-hsw2/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html > > * igt@kms_flip@flip-vs-expired-vblank: > - shard-skl: [FAIL][49] ([fdo#105363]) -> [PASS][50] > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl5/igt@kms_flip@flip-vs-expired-vblank.html > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl6/igt@kms_flip@flip-vs-expired-vblank.html > > * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt: > - shard-iclb: [FAIL][51] ([fdo#103167]) -> [PASS][52] +1 similar issue > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt.html > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt.html > > * igt@kms_frontbuffer_tracking@fbc-stridechange: > - shard-iclb: ([FAIL][53], [PASS][54]) ([fdo#103167]) -> [PASS][55] +4 similar issues > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-stridechange.html > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-stridechange.html > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-stridechange.html > > * igt@kms_plane_lowres@pipe-a-tiling-y: > - shard-iclb: ([PASS][56], [FAIL][57]) ([fdo#103166]) -> [PASS][58] > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-y.html > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-y.html > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-y.html > > * igt@kms_psr@psr2_cursor_render: > - shard-iclb: ([SKIP][59], [PASS][60]) ([fdo#109441]) -> [PASS][61] +1 similar issue > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb3/igt@kms_psr@psr2_cursor_render.html > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb2/igt@kms_psr@psr2_cursor_render.html > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb2/igt@kms_psr@psr2_cursor_render.html > > * igt@kms_psr@psr2_primary_mmap_cpu: > - shard-iclb: [SKIP][62] ([fdo#109441]) -> [PASS][63] > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html > > * igt@kms_setmode@basic: > - shard-kbl: [FAIL][64] ([fdo#99912]) -> [PASS][65] > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-kbl7/igt@kms_setmode@basic.html > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-kbl2/igt@kms_setmode@basic.html > > * igt@kms_sysfs_edid_timing: > - shard-iclb: ([PASS][66], [FAIL][67]) ([fdo#100047]) -> [PASS][68] > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb5/igt@kms_sysfs_edid_timing.html > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb3/igt@kms_sysfs_edid_timing.html > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb8/igt@kms_sysfs_edid_timing.html > > > #### Warnings #### > > * igt@i915_pm_rpm@modeset-pc8-residency-stress: > - shard-skl: [INCOMPLETE][69] ([fdo#107807]) -> [SKIP][70] ([fdo#109271]) > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl4/igt@i915_pm_rpm@modeset-pc8-residency-stress.html > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl7/igt@i915_pm_rpm@modeset-pc8-residency-stress.html > > * igt@kms_cursor_crc@cursor-128x128-onscreen: > - shard-skl: ([PASS][71], [FAIL][72]) ([fdo#103232]) -> [FAIL][73] ([fdo#103232]) +1 similar issue > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl8/igt@kms_cursor_crc@cursor-128x128-onscreen.html > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl2/igt@kms_cursor_crc@cursor-128x128-onscreen.html > [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl4/igt@kms_cursor_crc@cursor-128x128-onscreen.html > > * igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw: > - shard-iclb: ([FAIL][74], [PASS][75]) ([fdo#103167]) -> [FAIL][76] ([fdo#103167]) +2 similar issues > [74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html > [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html > [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html > > * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: > - shard-apl: ([DMESG-WARN][77], [PASS][78]) ([fdo#108566]) -> [DMESG-WARN][79] ([fdo#108566]) +2 similar issues > [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html > [78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl5/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html > [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-apl8/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html > > * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: > - shard-skl: ([FAIL][80], [PASS][81]) ([fdo#108145]) -> [FAIL][82] ([fdo#108145]) > [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > > * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: > - shard-skl: ([PASS][83], [FAIL][84]) ([fdo#108145] / [fdo#110403]) -> [FAIL][85] ([fdo#108145] / [fdo#110403]) > [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > [84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > [85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > > * igt@kms_psr@psr2_sprite_plane_onoff: > - shard-iclb: ([SKIP][86], [PASS][87]) ([fdo#109441]) -> [SKIP][88] ([fdo#109441]) +1 similar issue > [86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb1/igt@kms_psr@psr2_sprite_plane_onoff.html > [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-iclb2/igt@kms_psr@psr2_sprite_plane_onoff.html > [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-iclb4/igt@kms_psr@psr2_sprite_plane_onoff.html > > * igt@kms_setmode@basic: > - shard-apl: ([FAIL][89], [PASS][90]) ([fdo#99912]) -> [FAIL][91] ([fdo#99912]) > [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl5/igt@kms_setmode@basic.html > [90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6073/shard-apl4/igt@kms_setmode@basic.html > [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/shard-apl8/igt@kms_setmode@basic.html > > > [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047 > [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 > [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 > [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 > [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540 > [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108 > [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 > [fdo#105957]: https://bugs.freedesktop.org/show_bug.cgi?id=105957 > [fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773 > [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807 > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 > [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686 > [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 > [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [fdo#109982]: https://bugs.freedesktop.org/show_bug.cgi?id=109982 > [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 > [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 > > > Participating hosts (10 -> 10) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * Linux: CI_DRM_6073 -> Patchwork_13003 > > CI_DRM_6073: c059ddabfe60a5072ace44a34a9de9b4202df6ec @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_4978: b9b3646d4f04dd0204ead2a1a10f9e1806a0b622 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_13003: 28212f668a27819de69a172ee37dd33ed3755915 @ git://anongit.freedesktop.org/gfx-ci/linux > piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13003/
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 6477da22af28..6d60ea68c171 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -559,7 +559,6 @@ #define INTEL_ICL_PORT_F_IDS(info) \ INTEL_VGA_DEVICE(0x8A50, 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), \ @@ -573,7 +572,8 @@ #define INTEL_ICL_11_IDS(info) \ INTEL_ICL_PORT_F_IDS(info), \ - INTEL_VGA_DEVICE(0x8A51, info) + INTEL_VGA_DEVICE(0x8A51, info), \ + INTEL_VGA_DEVICE(0x8A5D, info) /* EHL */ #define INTEL_EHL_IDS(info) \
Add another ICL-Y PCIID that proved to have only 5 ports to the corresponding PCIID list. Meanwhile I'm trying to get a complete list of all PCIIDs with less than 6 ports and/or get a VBT fix to mark these ports non-existant, but until then the only way is to go one-by-one. This fixes the following error on machines with less than 6 port: [drm:intel_power_well_enable [i915]] enabling AUX F ------------[ cut here ]------------ WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1)) (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116) Cc: Mika Kahola <mika.kahola@intel.com> References: https://bugs.freedesktop.org/show_bug.cgi?id=108915 Signed-off-by: Imre Deak <imre.deak@intel.com> --- include/drm/i915_pciids.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)