| Message ID | 20191002144138.7917-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dp: remove static variable for aux last status | expand |
On Wed, Oct 02, 2019 at 05:41:38PM +0300, Jani Nikula wrote: > Add aux_busy_last_status to intel_dp. Don't bother with initializing to > all ones; the only difference is potentially missing logging for one > error case if the readout is all zeros. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com>a Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_types.h | 1 + > drivers/gpu/drm/i915/display/intel_dp.c | 5 ++--- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 976669f01a8c..1602aac7ca0f 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1185,6 +1185,7 @@ struct intel_dp { > /* sink or branch descriptor */ > struct drm_dp_desc desc; > struct drm_dp_aux aux; > + u32 aux_busy_last_status; > u8 train_set[4]; > int panel_power_up_delay; > int panel_power_down_delay; > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index f9fc9a1383e3..c697f551a1b0 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1347,13 +1347,12 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, > trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); > > if (try == 3) { > - static u32 last_status = -1; > const u32 status = intel_uncore_read(uncore, ch_ctl); > > - if (status != last_status) { > + if (status != intel_dp->aux_busy_last_status) { > WARN(1, "dp_aux_ch not started status 0x%08x\n", > status); > - last_status = status; > + intel_dp->aux_busy_last_status = status; > } > > ret = -EBUSY; > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 03 Oct 2019, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/i915/dp: remove static variable for aux last status (rev2) > URL : https://patchwork.freedesktop.org/series/67499/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_6996 -> Patchwork_14641 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_14641 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_14641, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/index.html > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_14641: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_selftest@live_execlists: > - fi-kbl-7500u: [PASS][1] -> [DMESG-FAIL][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-kbl-7500u/igt@i915_selftest@live_execlists.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-kbl-7500u/igt@i915_selftest@live_execlists.html > Pretty hard to imagine how the patch could cause this. Whatever it is, because the latter url gives access denied raw xml. BR, Jani. > > Known issues > ------------ > > Here are the changes found in Patchwork_14641 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_exec_reloc@basic-write-read-noreloc: > - fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724]) +1 similar issue > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-icl-u3/igt@gem_exec_reloc@basic-write-read-noreloc.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-icl-u3/igt@gem_exec_reloc@basic-write-read-noreloc.html > > > #### Possible fixes #### > > * igt@gem_flink_basic@double-flink: > - fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-icl-u3/igt@gem_flink_basic@double-flink.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-icl-u3/igt@gem_flink_basic@double-flink.html > > * igt@i915_selftest@live_gem_contexts: > - {fi-tgl-u}: [INCOMPLETE][7] -> [PASS][8] > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-tgl-u/igt@i915_selftest@live_gem_contexts.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-tgl-u/igt@i915_selftest@live_gem_contexts.html > > * igt@i915_selftest@live_hangcheck: > - fi-cfl-8109u: [INCOMPLETE][9] ([fdo#106070]) -> [PASS][10] > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-cfl-8109u/igt@i915_selftest@live_hangcheck.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-cfl-8109u/igt@i915_selftest@live_hangcheck.html > > * igt@kms_chamelium@hdmi-hpd-fast: > - fi-icl-u2: [FAIL][11] ([fdo#109483]) -> [PASS][12] > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html > > > #### Warnings #### > > * igt@i915_module_load@reload: > - fi-icl-u2: [DMESG-WARN][13] ([fdo#110595]) -> [DMESG-WARN][14] ([fdo#110595] / [fdo#111214]) > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/fi-icl-u2/igt@i915_module_load@reload.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/fi-icl-u2/igt@i915_module_load@reload.html > > > {name}: This element is suppressed. This means it is ignored when computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 > [fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070 > [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 > [fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483 > [fdo#110595]: https://bugs.freedesktop.org/show_bug.cgi?id=110595 > [fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108 > [fdo#111214]: https://bugs.freedesktop.org/show_bug.cgi?id=111214 > > > Participating hosts (52 -> 44) > ------------------------------ > > Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus fi-snb-2600 > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_6996 -> Patchwork_14641 > > CI-20190529: 20190529 > CI_DRM_6996: 98596d29a3cff9d996c42468eb606036faf42954 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5210: 74f55119f9920b65996535210a09147997804136 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_14641: ae2bd990429c5b3ffad8738ea82c15cb53f747e3 @ git://anongit.freedesktop.org/gfx-ci/linux > > > == Linux commits == > > ae2bd990429c drm/i915/dp: remove static variable for aux last status > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14641/index.html > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 03 Oct 2019, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/i915/dp: remove static variable for aux last status (rev3) > URL : https://patchwork.freedesktop.org/series/67499/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_6996_full -> Patchwork_14647_full > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_14647_full absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_14647_full, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_14647_full: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@gem_mmap_gtt@hang: > - shard-skl: [PASS][1] -> [DMESG-WARN][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl6/igt@gem_mmap_gtt@hang.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl6/igt@gem_mmap_gtt@hang.html > > * igt@perf@short-reads: > - shard-iclb: [PASS][3] -> [FAIL][4] > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb2/igt@perf@short-reads.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb4/igt@perf@short-reads.html Quite certain these were not caused by the patch. Thanks for the review, pushed. BR, Jani. > > > #### Suppressed #### > > The following results come from untrusted machines, tests, or statuses. > They do not affect the overall result. > > * {igt@i915_pm_dc@dc6-dpms}: > - shard-skl: [FAIL][5] ([fdo#110548]) -> [INCOMPLETE][6] > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl10/igt@i915_pm_dc@dc6-dpms.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl7/igt@i915_pm_dc@dc6-dpms.html > > > Known issues > ------------ > > Here are the changes found in Patchwork_14647_full that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_exec_schedule@in-order-bsd2: > - shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276]) +13 similar issues > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb1/igt@gem_exec_schedule@in-order-bsd2.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb5/igt@gem_exec_schedule@in-order-bsd2.html > > * igt@gem_exec_schedule@preemptive-hang-bsd: > - shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#111325]) +7 similar issues > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb3/igt@gem_exec_schedule@preemptive-hang-bsd.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html > > * igt@gem_fence_thrash@bo-copy: > - shard-hsw: [PASS][11] -> [INCOMPLETE][12] ([fdo#103540]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-hsw1/igt@gem_fence_thrash@bo-copy.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-hsw8/igt@gem_fence_thrash@bo-copy.html > > * igt@gem_userptr_blits@coherency-sync: > - shard-hsw: [PASS][13] -> [DMESG-WARN][14] ([fdo#111870]) > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-hsw6/igt@gem_userptr_blits@coherency-sync.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-hsw7/igt@gem_userptr_blits@coherency-sync.html > > * igt@gem_userptr_blits@sync-unmap-cycles: > - shard-snb: [PASS][15] -> [DMESG-WARN][16] ([fdo#111870]) > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-snb2/igt@gem_userptr_blits@sync-unmap-cycles.html > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-snb5/igt@gem_userptr_blits@sync-unmap-cycles.html > - shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#109385] / [fdo#111870]) > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-apl3/igt@gem_userptr_blits@sync-unmap-cycles.html > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-apl1/igt@gem_userptr_blits@sync-unmap-cycles.html > > * igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen: > - shard-apl: [PASS][19] -> [FAIL][20] ([fdo#103232]) > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-apl6/igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen.html > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen.html > > * igt@kms_cursor_legacy@pipe-c-forked-bo: > - shard-iclb: [PASS][21] -> [INCOMPLETE][22] ([fdo#107713]) > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb4/igt@kms_cursor_legacy@pipe-c-forked-bo.html > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb7/igt@kms_cursor_legacy@pipe-c-forked-bo.html > > * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render: > - shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#103167]) +5 similar issues > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html > > * igt@kms_frontbuffer_tracking@psr-modesetfrombusy: > - shard-skl: [PASS][25] -> [FAIL][26] ([fdo#103167]) > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl7/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl8/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html > > * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: > - shard-skl: [PASS][27] -> [FAIL][28] ([fdo#108145] / [fdo#110403]) > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > > * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min: > - shard-skl: [PASS][29] -> [FAIL][30] ([fdo#108145]) > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html > > * igt@kms_psr2_su@frontbuffer: > - shard-iclb: [PASS][31] -> [SKIP][32] ([fdo#109642] / [fdo#111068]) > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb2/igt@kms_psr2_su@frontbuffer.html > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb4/igt@kms_psr2_su@frontbuffer.html > > * igt@kms_psr@psr2_suspend: > - shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +1 similar issue > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb2/igt@kms_psr@psr2_suspend.html > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb4/igt@kms_psr@psr2_suspend.html > > * igt@kms_vblank@pipe-b-ts-continuation-suspend: > - shard-apl: [PASS][35] -> [DMESG-WARN][36] ([fdo#108566]) +4 similar issues > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-apl8/igt@kms_vblank@pipe-b-ts-continuation-suspend.html > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-apl3/igt@kms_vblank@pipe-b-ts-continuation-suspend.html > > * igt@perf@blocking: > - shard-skl: [PASS][37] -> [FAIL][38] ([fdo#110728]) +1 similar issue > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl1/igt@perf@blocking.html > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl1/igt@perf@blocking.html > > > #### Possible fixes #### > > * igt@gem_exec_schedule@in-order-bsd: > - shard-iclb: [SKIP][39] ([fdo#111325]) -> [PASS][40] +6 similar issues > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb2/igt@gem_exec_schedule@in-order-bsd.html > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb3/igt@gem_exec_schedule@in-order-bsd.html > > * igt@gem_exec_suspend@basic-s3: > - shard-iclb: [FAIL][41] -> [PASS][42] > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb2/igt@gem_exec_suspend@basic-s3.html > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb4/igt@gem_exec_suspend@basic-s3.html > > * igt@gem_mmap_gtt@basic-small-copy: > - shard-hsw: [DMESG-WARN][43] -> [PASS][44] > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-hsw6/igt@gem_mmap_gtt@basic-small-copy.html > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-hsw6/igt@gem_mmap_gtt@basic-small-copy.html > > * igt@gem_userptr_blits@map-fixed-invalidate-busy-gup: > - shard-skl: [DMESG-WARN][45] ([fdo#111870]) -> [PASS][46] > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl1/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl1/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html > > * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy: > - shard-hsw: [DMESG-WARN][47] ([fdo#111870]) -> [PASS][48] > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-hsw8/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-hsw1/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html > > * igt@gem_userptr_blits@sync-unmap: > - shard-kbl: [DMESG-WARN][49] ([fdo#111870]) -> [PASS][50] +1 similar issue > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-kbl3/igt@gem_userptr_blits@sync-unmap.html > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-kbl7/igt@gem_userptr_blits@sync-unmap.html > > * igt@i915_pm_backlight@fade_with_suspend: > - {shard-tglb}: [INCOMPLETE][51] ([fdo#111832]) -> [PASS][52] +2 similar issues > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-tglb4/igt@i915_pm_backlight@fade_with_suspend.html > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-tglb1/igt@i915_pm_backlight@fade_with_suspend.html > > * igt@kms_atomic_transition@plane-all-modeset-transition-fencing: > - shard-apl: [INCOMPLETE][53] ([fdo#103927]) -> [PASS][54] +2 similar issues > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-apl3/igt@kms_atomic_transition@plane-all-modeset-transition-fencing.html > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-apl7/igt@kms_atomic_transition@plane-all-modeset-transition-fencing.html > > * igt@kms_color@pipe-a-ctm-0-75: > - shard-skl: [FAIL][55] ([fdo#108682]) -> [PASS][56] > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl7/igt@kms_color@pipe-a-ctm-0-75.html > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl8/igt@kms_color@pipe-a-ctm-0-75.html > > * igt@kms_flip@2x-flip-vs-suspend: > - shard-hsw: [INCOMPLETE][57] ([fdo#103540]) -> [PASS][58] +1 similar issue > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-hsw6/igt@kms_flip@2x-flip-vs-suspend.html > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-hsw7/igt@kms_flip@2x-flip-vs-suspend.html > > * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite: > - shard-iclb: [FAIL][59] ([fdo#103167]) -> [PASS][60] +3 similar issues > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html > > * igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary: > - {shard-tglb}: [FAIL][61] ([fdo#103167]) -> [PASS][62] +6 similar issues > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary.html > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary.html > > * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: > - shard-skl: [FAIL][63] ([fdo#108145] / [fdo#110403]) -> [PASS][64] > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html > > * igt@kms_psr@psr2_cursor_plane_move: > - shard-iclb: [SKIP][65] ([fdo#109441]) -> [PASS][66] > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb3/igt@kms_psr@psr2_cursor_plane_move.html > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html > > * igt@kms_vblank@pipe-a-ts-continuation-suspend: > - shard-apl: [DMESG-WARN][67] ([fdo#108566]) -> [PASS][68] +3 similar issues > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-apl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-apl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html > > * igt@prime_vgem@fence-wait-bsd2: > - shard-iclb: [SKIP][69] ([fdo#109276]) -> [PASS][70] +12 similar issues > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb7/igt@prime_vgem@fence-wait-bsd2.html > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb4/igt@prime_vgem@fence-wait-bsd2.html > > > #### Warnings #### > > * igt@gem_mocs_settings@mocs-isolation-bsd2: > - shard-iclb: [FAIL][71] ([fdo#111330]) -> [SKIP][72] ([fdo#109276]) > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6996/shard-iclb1/igt@gem_mocs_settings@mocs-isolation-bsd2.html > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14647/shard-iclb5/igt@gem_mocs_settings@mocs-isolation-bsd2.html > > > {name}: This element is suppressed. This means it is ignored when computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > [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#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 > [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 > [fdo#108682]: https://bugs.freedesktop.org/show_bug.cgi?id=108682 > [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 > [fdo#109385]: https://bugs.freedesktop.org/show_bug.cgi?id=109385 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 > [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 > [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548 > [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 > [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 > [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325 > [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329 > [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 > [fdo#111597]: https://bugs.freedesktop.org/show_bug.cgi?id=111597 > [fdo#111646]: https://bugs.freedesktop.org/show_bug.cgi?id=111646 > [fdo#111671]: https://bugs.freedesktop.org/show_bug.cgi?id=111671 > [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832 > [fdo#111855]: https://bugs.freedesktop.org/show_bug.cgi?id=111855 > [fdo#111867]: https://bugs.freedesktop.org/show_bug.cgi?id=111867 > [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870 > > > Participating hosts (11 -> 11) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_6996 -> Patchwork_14647 > > CI-20190529: 20190529 > CI_DRM_6996: 98596d29a3cff9d996c42468eb606036faf42954 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5210: 74f55119f9920b65996535210a09147997804136 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_14647: c6941116c4d037b07a30f4c10f30323e752f47fa @ 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_14647/index.html > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 976669f01a8c..1602aac7ca0f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1185,6 +1185,7 @@ struct intel_dp { /* sink or branch descriptor */ struct drm_dp_desc desc; struct drm_dp_aux aux; + u32 aux_busy_last_status; u8 train_set[4]; int panel_power_up_delay; int panel_power_down_delay; diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index f9fc9a1383e3..c697f551a1b0 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1347,13 +1347,12 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); if (try == 3) { - static u32 last_status = -1; const u32 status = intel_uncore_read(uncore, ch_ctl); - if (status != last_status) { + if (status != intel_dp->aux_busy_last_status) { WARN(1, "dp_aux_ch not started status 0x%08x\n", status); - last_status = status; + intel_dp->aux_busy_last_status = status; } ret = -EBUSY;
Add aux_busy_last_status to intel_dp. Don't bother with initializing to all ones; the only difference is potentially missing logging for one error case if the readout is all zeros. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-)