| Message ID | 20170223115102.7059-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 23, 2017 at 12:22:00PM -0000, Patchwork wrote: > == Series Details == > > Series: Revert "drm/i915/dp: Ratelimit DP aux timeout messages" > URL : https://patchwork.freedesktop.org/series/20140/ > State : success > > == Summary == > > Series 20140v1 Revert "drm/i915/dp: Ratelimit DP aux timeout messages" > https://patchwork.freedesktop.org/api/1.0/series/20140/revisions/1/mbox/ > > Test drv_module_reload: > Subgroup basic-reload: > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-byt-j1900) > Test gem_exec_suspend: > Subgroup basic-s3: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-skl-6260u) fdo#99803 > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-skl-6770hq) > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-bdw-5557u) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-s4-devices: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-skl-6260u) > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-skl-6770hq) > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-bdw-5557u) > dmesg-warn -> PASS (fi-byt-j1900) > Test kms_busy: > Subgroup basic-flip-default-a: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-skl-6260u) > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-skl-6770hq) > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-bdw-5557u) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-flip-default-c: > dmesg-warn -> PASS (fi-skl-6770hq) > Test kms_cursor_legacy: > Subgroup basic-busy-flip-before-cursor-legacy: > dmesg-warn -> PASS (fi-skl-6260u) > Subgroup basic-flip-after-cursor-atomic: > dmesg-warn -> PASS (fi-ivb-3770) > Subgroup basic-flip-after-cursor-legacy: > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-flip-after-cursor-varying-size: > dmesg-warn -> PASS (fi-skl-6770hq) > Subgroup basic-flip-before-cursor-atomic: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-bdw-5557u) > Subgroup basic-flip-before-cursor-varying-size: > dmesg-warn -> PASS (fi-snb-2520m) > Test kms_flip: > Subgroup basic-flip-vs-dpms: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-skl-6770hq) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-flip-vs-modeset: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-skl-6770hq) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-flip-vs-wf_vblank: > dmesg-warn -> PASS (fi-snb-2600) > dmesg-warn -> PASS (fi-skl-6260u) > dmesg-warn -> PASS (fi-kbl-7500u) > dmesg-warn -> PASS (fi-byt-n2820) > dmesg-warn -> PASS (fi-skl-6770hq) fdo#99739 > dmesg-warn -> PASS (fi-hsw-4770) > dmesg-warn -> PASS (fi-bsw-n3050) > dmesg-warn -> PASS (fi-ivb-3770) > dmesg-warn -> PASS (fi-snb-2520m) > dmesg-warn -> PASS (fi-bdw-5557u) > dmesg-warn -> PASS (fi-byt-j1900) > Subgroup basic-plain-flip: > dmesg-warn -> PASS (fi-snb-2600) > WARNING: Long output truncated irc acked-by Ville, pushed. -Chris
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7cfab76040be..adf0fb4dc928 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1121,8 +1121,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, /* Timeouts occur when the device isn't connected, so they're * "normal" -- don't fill the kernel log with these */ if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { - DRM_DEBUG_KMS_RATELIMITED("dp_aux_ch timeout status 0x%08x\n", - status); + DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); ret = -ETIMEDOUT; goto out; }
This reverts commit 7ee686034b8b "drm/i915/dp: Ratelimit DP aux timeout messages" as although it successfully squelches the debug messages, when it does so it generated a warning instead. CI lights up orange with all the warnings! In its current incarnation DRM_DEBUG_RATELIMITED is not usable for us, and we need to first teach lib/ratelimit.c not to warn when used for debug messages. Fixes: 7ee686034b8b ("drm/i915/dp: Ratelimit DP aux timeout messages") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Lyude <lyude@redhat.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/i915/intel_dp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)