| Message ID | 20241205093042.3028608-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/display: clean up DP Adaptive Sync SDP state mismatch logging | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani > Nikula > Sent: 05 December 2024 15:01 > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org > Cc: Nikula, Jani <jani.nikula@intel.com> > Subject: [PATCH] drm/i915/display: clean up DP Adaptive Sync SDP state > mismatch logging > > Pass the drm_printer from intel_pipe_config_compare(), and use it for > logging, along with pipe_config_mismatch(), to simplify and unify. > > While at it, differentiate the VSC and AS SDP log texts from each other. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 29 +++++++------------- > 1 file changed, 10 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 28c1b372cc95..1159f8c3d206 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5216,7 +5216,7 @@ pipe_config_dp_vsc_sdp_mismatch(struct > drm_printer *p, bool fastset, > const struct drm_dp_vsc_sdp *a, > const struct drm_dp_vsc_sdp *b) > { > - pipe_config_mismatch(p, fastset, crtc, name, "dp sdp"); > + pipe_config_mismatch(p, fastset, crtc, name, "dp vsc sdp"); > > drm_printf(p, "expected:\n"); > drm_dp_vsc_sdp_log(p, a); > @@ -5225,27 +5225,18 @@ pipe_config_dp_vsc_sdp_mismatch(struct > drm_printer *p, bool fastset, } > > static void > -pipe_config_dp_as_sdp_mismatch(struct drm_i915_private *i915, > - bool fastset, const char *name, > +pipe_config_dp_as_sdp_mismatch(struct drm_printer *p, bool fastset, > + const struct intel_crtc *crtc, > + const char *name, > const struct drm_dp_as_sdp *a, > const struct drm_dp_as_sdp *b) { > - struct drm_printer p; > + pipe_config_mismatch(p, fastset, crtc, name, "dp as sdp"); > > - if (fastset) { > - p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); > - > - drm_printf(&p, "fastset requirement not met in %s dp > sdp\n", name); > - } else { > - p = drm_err_printer(&i915->drm, NULL); > - > - drm_printf(&p, "mismatch in %s dp sdp\n", name); > - } > - > - drm_printf(&p, "expected:\n"); > - drm_dp_as_sdp_log(&p, a); > - drm_printf(&p, "found:\n"); > - drm_dp_as_sdp_log(&p, b); > + drm_printf(p, "expected:\n"); > + drm_dp_as_sdp_log(p, a); > + drm_printf(p, "found:\n"); > + drm_dp_as_sdp_log(p, b); Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > } > > /* Returns the length up to and including the last differing byte */ @@ - > 5507,7 +5498,7 @@ intel_pipe_config_compare(const struct intel_crtc_state > *current_config, #define PIPE_CONF_CHECK_DP_AS_SDP(name) do { \ > if (!intel_compare_dp_as_sdp(¤t_config->infoframes.name, \ > &pipe_config->infoframes.name)) { \ > - pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, > __stringify(name), \ > + pipe_config_dp_as_sdp_mismatch(&p, fastset, crtc, > __stringify(name), > +\ > ¤t_config- > >infoframes.name, \ > &pipe_config- > >infoframes.name); \ > ret = false; \ > -- > 2.39.5
On Tue, 10 Dec 2024, "Golani, Mitulkumar Ajitkumar" <mitulkumar.ajitkumar.golani@intel.com> wrote: >> -----Original Message----- >> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani >> Nikula >> Sent: 05 December 2024 15:01 >> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org >> Cc: Nikula, Jani <jani.nikula@intel.com> >> Subject: [PATCH] drm/i915/display: clean up DP Adaptive Sync SDP state >> mismatch logging >> >> Pass the drm_printer from intel_pipe_config_compare(), and use it for >> logging, along with pipe_config_mismatch(), to simplify and unify. >> >> While at it, differentiate the VSC and AS SDP log texts from each other. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/display/intel_display.c | 29 +++++++------------- >> 1 file changed, 10 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c >> b/drivers/gpu/drm/i915/display/intel_display.c >> index 28c1b372cc95..1159f8c3d206 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.c >> +++ b/drivers/gpu/drm/i915/display/intel_display.c >> @@ -5216,7 +5216,7 @@ pipe_config_dp_vsc_sdp_mismatch(struct >> drm_printer *p, bool fastset, >> const struct drm_dp_vsc_sdp *a, >> const struct drm_dp_vsc_sdp *b) >> { >> - pipe_config_mismatch(p, fastset, crtc, name, "dp sdp"); >> + pipe_config_mismatch(p, fastset, crtc, name, "dp vsc sdp"); >> >> drm_printf(p, "expected:\n"); >> drm_dp_vsc_sdp_log(p, a); >> @@ -5225,27 +5225,18 @@ pipe_config_dp_vsc_sdp_mismatch(struct >> drm_printer *p, bool fastset, } >> >> static void >> -pipe_config_dp_as_sdp_mismatch(struct drm_i915_private *i915, >> - bool fastset, const char *name, >> +pipe_config_dp_as_sdp_mismatch(struct drm_printer *p, bool fastset, >> + const struct intel_crtc *crtc, >> + const char *name, >> const struct drm_dp_as_sdp *a, >> const struct drm_dp_as_sdp *b) { >> - struct drm_printer p; >> + pipe_config_mismatch(p, fastset, crtc, name, "dp as sdp"); >> >> - if (fastset) { >> - p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); >> - >> - drm_printf(&p, "fastset requirement not met in %s dp >> sdp\n", name); >> - } else { >> - p = drm_err_printer(&i915->drm, NULL); >> - >> - drm_printf(&p, "mismatch in %s dp sdp\n", name); >> - } >> - >> - drm_printf(&p, "expected:\n"); >> - drm_dp_as_sdp_log(&p, a); >> - drm_printf(&p, "found:\n"); >> - drm_dp_as_sdp_log(&p, b); >> + drm_printf(p, "expected:\n"); >> + drm_dp_as_sdp_log(p, a); >> + drm_printf(p, "found:\n"); >> + drm_dp_as_sdp_log(p, b); > > Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> Thanks for the review, pushed to drm-intel-next. BR, Jani. >> } >> >> /* Returns the length up to and including the last differing byte */ @@ - >> 5507,7 +5498,7 @@ intel_pipe_config_compare(const struct intel_crtc_state >> *current_config, #define PIPE_CONF_CHECK_DP_AS_SDP(name) do { \ >> if (!intel_compare_dp_as_sdp(¤t_config->infoframes.name, \ >> &pipe_config->infoframes.name)) { \ >> - pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, >> __stringify(name), \ >> + pipe_config_dp_as_sdp_mismatch(&p, fastset, crtc, >> __stringify(name), >> +\ >> ¤t_config- >> >infoframes.name, \ >> &pipe_config- >> >infoframes.name); \ >> ret = false; \ >> -- >> 2.39.5 >
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 28c1b372cc95..1159f8c3d206 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5216,7 +5216,7 @@ pipe_config_dp_vsc_sdp_mismatch(struct drm_printer *p, bool fastset, const struct drm_dp_vsc_sdp *a, const struct drm_dp_vsc_sdp *b) { - pipe_config_mismatch(p, fastset, crtc, name, "dp sdp"); + pipe_config_mismatch(p, fastset, crtc, name, "dp vsc sdp"); drm_printf(p, "expected:\n"); drm_dp_vsc_sdp_log(p, a); @@ -5225,27 +5225,18 @@ pipe_config_dp_vsc_sdp_mismatch(struct drm_printer *p, bool fastset, } static void -pipe_config_dp_as_sdp_mismatch(struct drm_i915_private *i915, - bool fastset, const char *name, +pipe_config_dp_as_sdp_mismatch(struct drm_printer *p, bool fastset, + const struct intel_crtc *crtc, + const char *name, const struct drm_dp_as_sdp *a, const struct drm_dp_as_sdp *b) { - struct drm_printer p; + pipe_config_mismatch(p, fastset, crtc, name, "dp as sdp"); - if (fastset) { - p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL); - - drm_printf(&p, "fastset requirement not met in %s dp sdp\n", name); - } else { - p = drm_err_printer(&i915->drm, NULL); - - drm_printf(&p, "mismatch in %s dp sdp\n", name); - } - - drm_printf(&p, "expected:\n"); - drm_dp_as_sdp_log(&p, a); - drm_printf(&p, "found:\n"); - drm_dp_as_sdp_log(&p, b); + drm_printf(p, "expected:\n"); + drm_dp_as_sdp_log(p, a); + drm_printf(p, "found:\n"); + drm_dp_as_sdp_log(p, b); } /* Returns the length up to and including the last differing byte */ @@ -5507,7 +5498,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, #define PIPE_CONF_CHECK_DP_AS_SDP(name) do { \ if (!intel_compare_dp_as_sdp(¤t_config->infoframes.name, \ &pipe_config->infoframes.name)) { \ - pipe_config_dp_as_sdp_mismatch(dev_priv, fastset, __stringify(name), \ + pipe_config_dp_as_sdp_mismatch(&p, fastset, crtc, __stringify(name), \ ¤t_config->infoframes.name, \ &pipe_config->infoframes.name); \ ret = false; \
Pass the drm_printer from intel_pipe_config_compare(), and use it for logging, along with pipe_config_mismatch(), to simplify and unify. While at it, differentiate the VSC and AS SDP log texts from each other. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 29 +++++++------------- 1 file changed, 10 insertions(+), 19 deletions(-)