Message ID | 20240215164055.30585-12-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Use drm_printer more | expand |
On Thu, 15 Feb 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Just call pipe_config_mismatch() from all the more specialized > mismatch() functions instead of hand rolling the same printfs > all over. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 45 +++++--------------- > 1 file changed, 10 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index a9dd3632898c..26580d4aef2d 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -4826,17 +4826,13 @@ pipe_config_infoframe_mismatch(bool fastset, const struct intel_crtc *crtc, > > p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); > loglevel = KERN_DEBUG; > - > - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s infoframe\n", > - crtc->base.base.id, crtc->base.name, name); > } else { > p = drm_err_printer(&i915->drm, NULL); > loglevel = KERN_ERR; > - > - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s infoframe\n", > - crtc->base.base.id, crtc->base.name, name); > } > > + pipe_config_mismatch(fastset, crtc, name, "infoframe"); > + > drm_printf(&p, "expected:\n"); > hdmi_infoframe_log(loglevel, i915->drm.dev, a); > drm_printf(&p, "found:\n"); > @@ -4852,17 +4848,12 @@ pipe_config_dp_vsc_sdp_mismatch(bool fastset, const struct intel_crtc *crtc, > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > struct drm_printer p; > > - if (fastset) { > + if (fastset) > p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); > - > - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s dp sdp\n", > - crtc->base.base.id, crtc->base.name, name); > - } else { > + else > p = drm_err_printer(&i915->drm, NULL); > > - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s dp sdp\n", > - crtc->base.base.id, crtc->base.name, name); > - } > + pipe_config_mismatch(fastset, crtc, name, "dp sdp"); > > drm_printf(&p, "expected:\n"); > drm_dp_vsc_sdp_log(&p, a); > @@ -4889,27 +4880,19 @@ pipe_config_buffer_mismatch(bool fastset, const struct intel_crtc *crtc, > const char *name, > const u8 *a, const u8 *b, size_t len) > { > - struct drm_i915_private *i915 = to_i915(crtc->base.dev); > - struct drm_printer p; > const char *loglevel; > > if (fastset) { > if (!drm_debug_enabled(DRM_UT_KMS)) > return; > > - p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); > loglevel = KERN_DEBUG; > - > - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s buffer\n", > - crtc->base.base.id, crtc->base.name, name); > } else { > - p = drm_err_printer(&i915->drm, NULL); > loglevel = KERN_ERR; > - > - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s buffer\n", > - crtc->base.base.id, crtc->base.name, name); > } > > + pipe_config_mismatch(fastset, crtc, name, "buffer"); > + > /* only dump up to the last difference */ > len = memcmp_diff_len(a, b, len); > > @@ -4929,20 +4912,12 @@ pipe_config_pll_mismatch(bool fastset, > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > struct drm_printer p; > > - if (fastset) { > - if (!drm_debug_enabled(DRM_UT_KMS)) > - return; Removing this seems misplaced. Other than that, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > - > + if (fastset) > p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); > - > - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s\n", > - crtc->base.base.id, crtc->base.name, name); > - } else { > + else > p = drm_err_printer(&i915->drm, NULL); > > - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s\n", > - crtc->base.base.id, crtc->base.name, name); > - } > + pipe_config_mismatch(fastset, crtc, name, " "); /* stupid -Werror=format-zero-length */ > > drm_dbg_kms(&i915->drm, "expected:\n"); > intel_dpll_dump_hw_state(i915, &p, a);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index a9dd3632898c..26580d4aef2d 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -4826,17 +4826,13 @@ pipe_config_infoframe_mismatch(bool fastset, const struct intel_crtc *crtc, p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); loglevel = KERN_DEBUG; - - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s infoframe\n", - crtc->base.base.id, crtc->base.name, name); } else { p = drm_err_printer(&i915->drm, NULL); loglevel = KERN_ERR; - - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s infoframe\n", - crtc->base.base.id, crtc->base.name, name); } + pipe_config_mismatch(fastset, crtc, name, "infoframe"); + drm_printf(&p, "expected:\n"); hdmi_infoframe_log(loglevel, i915->drm.dev, a); drm_printf(&p, "found:\n"); @@ -4852,17 +4848,12 @@ pipe_config_dp_vsc_sdp_mismatch(bool fastset, const struct intel_crtc *crtc, struct drm_i915_private *i915 = to_i915(crtc->base.dev); struct drm_printer p; - if (fastset) { + if (fastset) p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); - - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s dp sdp\n", - crtc->base.base.id, crtc->base.name, name); - } else { + else p = drm_err_printer(&i915->drm, NULL); - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s dp sdp\n", - crtc->base.base.id, crtc->base.name, name); - } + pipe_config_mismatch(fastset, crtc, name, "dp sdp"); drm_printf(&p, "expected:\n"); drm_dp_vsc_sdp_log(&p, a); @@ -4889,27 +4880,19 @@ pipe_config_buffer_mismatch(bool fastset, const struct intel_crtc *crtc, const char *name, const u8 *a, const u8 *b, size_t len) { - struct drm_i915_private *i915 = to_i915(crtc->base.dev); - struct drm_printer p; const char *loglevel; if (fastset) { if (!drm_debug_enabled(DRM_UT_KMS)) return; - p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); loglevel = KERN_DEBUG; - - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s buffer\n", - crtc->base.base.id, crtc->base.name, name); } else { - p = drm_err_printer(&i915->drm, NULL); loglevel = KERN_ERR; - - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s buffer\n", - crtc->base.base.id, crtc->base.name, name); } + pipe_config_mismatch(fastset, crtc, name, "buffer"); + /* only dump up to the last difference */ len = memcmp_diff_len(a, b, len); @@ -4929,20 +4912,12 @@ pipe_config_pll_mismatch(bool fastset, struct drm_i915_private *i915 = to_i915(crtc->base.dev); struct drm_printer p; - if (fastset) { - if (!drm_debug_enabled(DRM_UT_KMS)) - return; - + if (fastset) p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); - - drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s\n", - crtc->base.base.id, crtc->base.name, name); - } else { + else p = drm_err_printer(&i915->drm, NULL); - drm_printf(&p, "[CRTC:%d:%s] mismatch in %s\n", - crtc->base.base.id, crtc->base.name, name); - } + pipe_config_mismatch(fastset, crtc, name, " "); /* stupid -Werror=format-zero-length */ drm_dbg_kms(&i915->drm, "expected:\n"); intel_dpll_dump_hw_state(i915, &p, a);