drm/i915: Convert intel_dpll_dump_hw_state() to drm_printer

Utilize drm_printer in pipe_config_pll_mismatch() to avoid
a bit of code duplication.

To achieve this we need to plumb the printer all way to the
dpll_mgr .dump_hw_state() functions. Those are also used by
intel_crtc_state_dump() which needs to be adjusted as well.

v2: Convert a few misplaecd drm_dbg_kms() calls (Rodrigo)
    Drop the redundant drm_debug_enabled() check here
    instead of later (Jani)

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229184049.31165-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
index 4bcf446c75f49a5cd8115313fd0f1a152c798fd5..59d2b3d39951491f410f66d0a4dc3487aa59bbdf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
@@ -205,9 +205,12 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config,
        struct drm_i915_private *i915 = to_i915(crtc->base.dev);
        const struct intel_plane_state *plane_state;
        struct intel_plane *plane;
+       struct drm_printer p;
        char buf[64];
        int i;
 
+       p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL);
+
        drm_dbg_kms(&i915->drm, "[CRTC:%d:%s] enable: %s [%s]\n",
                    crtc->base.base.id, crtc->base.name,
                    str_yes_no(pipe_config->hw.enable), context);
@@ -356,7 +359,7 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config,
                    pipe_config->ips_enabled, pipe_config->double_wide,
                    pipe_config->has_drrs);
 
-       intel_dpll_dump_hw_state(i915, &pipe_config->dpll_hw_state);
+       intel_dpll_dump_hw_state(i915, &p, &pipe_config->dpll_hw_state);
 
        if (IS_CHERRYVIEW(i915))
                drm_dbg_kms(&i915->drm,

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 971c742fa7b5dbe8363e3a6765e8a8c5d1501490..cdd489c1d145a280c02fde25d79c84e79f9df946 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4937,26 +4937,24 @@ pipe_config_pll_mismatch(bool fastset,
                         const struct intel_dpll_hw_state *b)
 {
        struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       struct drm_printer p;
 
        if (fastset) {
-               if (!drm_debug_enabled(DRM_UT_KMS))
-                       return;
+               p = drm_dbg_printer(&i915->drm, DRM_UT_KMS, NULL);
 
-               drm_dbg_kms(&i915->drm,
-                           "[CRTC:%d:%s] fastset requirement not met in %s\n",
-                           crtc->base.base.id, crtc->base.name, name);
-               drm_dbg_kms(&i915->drm, "expected:\n");
-               intel_dpll_dump_hw_state(i915, a);
-               drm_dbg_kms(&i915->drm, "found:\n");
-               intel_dpll_dump_hw_state(i915, b);
+               drm_printf(&p, "[CRTC:%d:%s] fastset requirement not met in %s\n",
+                          crtc->base.base.id, crtc->base.name, name);
        } else {
-               drm_err(&i915->drm, "[CRTC:%d:%s] mismatch in %s buffer\n",
-                       crtc->base.base.id, crtc->base.name, name);
-               drm_err(&i915->drm, "expected:\n");
-               intel_dpll_dump_hw_state(i915, a);
-               drm_err(&i915->drm, "found:\n");
-               intel_dpll_dump_hw_state(i915, b);
+               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);
        }
+
+       drm_printf(&p, "expected:\n");
+       intel_dpll_dump_hw_state(i915, &p, a);
+       drm_printf(&p, "found:\n");
+       intel_dpll_dump_hw_state(i915, &p, b);
 }
 
 bool

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index ff480f171f75a2602673e49c015a1f0441e33a53..9542e62186e2181776686383494d7acd88fc7ce5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -107,7 +107,7 @@ struct intel_dpll_mgr {
                                   struct intel_crtc *crtc,
                                   struct intel_encoder *encoder);
        void (*update_ref_clks)(struct drm_i915_private *i915);
-       void (*dump_hw_state)(struct drm_i915_private *i915,
+       void (*dump_hw_state)(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state);
        bool (*compare_hw_state)(const struct intel_dpll_hw_state *a,
                                 const struct intel_dpll_hw_state *b);
@@ -634,16 +634,15 @@ static int ibx_get_dpll(struct intel_atomic_state *state,
        return 0;
 }
 
-static void ibx_dump_hw_state(struct drm_i915_private *i915,
+static void ibx_dump_hw_state(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
-       drm_dbg_kms(&i915->drm,
-                   "dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, "
-                   "fp0: 0x%x, fp1: 0x%x\n",
-                   hw_state->dpll,
-                   hw_state->dpll_md,
-                   hw_state->fp0,
-                   hw_state->fp1);
+       drm_printf(p, "dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, "
+                  "fp0: 0x%x, fp1: 0x%x\n",
+                  hw_state->dpll,
+                  hw_state->dpll_md,
+                  hw_state->fp0,
+                  hw_state->fp1);
 }
 
 static bool ibx_compare_hw_state(const struct intel_dpll_hw_state *a,
@@ -1225,11 +1224,11 @@ static void hsw_update_dpll_ref_clks(struct drm_i915_private *i915)
                i915->display.dpll.ref_clks.nssc = 135000;
 }
 
-static void hsw_dump_hw_state(struct drm_i915_private *i915,
+static void hsw_dump_hw_state(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
-       drm_dbg_kms(&i915->drm, "dpll_hw_state: wrpll: 0x%x spll: 0x%x\n",
-                   hw_state->wrpll, hw_state->spll);
+       drm_printf(p, "dpll_hw_state: wrpll: 0x%x spll: 0x%x\n",
+                  hw_state->wrpll, hw_state->spll);
 }
 
 static bool hsw_compare_hw_state(const struct intel_dpll_hw_state *a,
@@ -1939,14 +1938,11 @@ static void skl_update_dpll_ref_clks(struct drm_i915_private *i915)
        i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref;
 }
 
-static void skl_dump_hw_state(struct drm_i915_private *i915,
+static void skl_dump_hw_state(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
-       drm_dbg_kms(&i915->drm, "dpll_hw_state: "
-                     "ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n",
-                     hw_state->ctrl1,
-                     hw_state->cfgcr1,
-                     hw_state->cfgcr2);
+       drm_printf(p, "dpll_hw_state: ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n",
+                  hw_state->ctrl1, hw_state->cfgcr1, hw_state->cfgcr2);
 }
 
 static bool skl_compare_hw_state(const struct intel_dpll_hw_state *a,
@@ -2402,23 +2398,16 @@ static void bxt_update_dpll_ref_clks(struct drm_i915_private *i915)
        /* DSI non-SSC ref 19.2MHz */
 }
 
-static void bxt_dump_hw_state(struct drm_i915_private *i915,
+static void bxt_dump_hw_state(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
-       drm_dbg_kms(&i915->drm, "dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x,"
-                   "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
-                   "pll6: 0x%x, pll8: 0x%x, pll9: 0x%x, pll10: 0x%x, pcsdw12: 0x%x\n",
-                   hw_state->ebb0,
-                   hw_state->ebb4,
-                   hw_state->pll0,
-                   hw_state->pll1,
-                   hw_state->pll2,
-                   hw_state->pll3,
-                   hw_state->pll6,
-                   hw_state->pll8,
-                   hw_state->pll9,
-                   hw_state->pll10,
-                   hw_state->pcsdw12);
+       drm_printf(p, "dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x,"
+                  "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
+                  "pll6: 0x%x, pll8: 0x%x, pll9: 0x%x, pll10: 0x%x, pcsdw12: 0x%x\n",
+                  hw_state->ebb0, hw_state->ebb4,
+                  hw_state->pll0, hw_state->pll1, hw_state->pll2, hw_state->pll3,
+                  hw_state->pll6, hw_state->pll8, hw_state->pll9, hw_state->pll10,
+                  hw_state->pcsdw12);
 }
 
 static bool bxt_compare_hw_state(const struct intel_dpll_hw_state *a,
@@ -4026,28 +4015,26 @@ static void icl_update_dpll_ref_clks(struct drm_i915_private *i915)
        i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref;
 }
 
-static void icl_dump_hw_state(struct drm_i915_private *i915,
+static void icl_dump_hw_state(struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
-       drm_dbg_kms(&i915->drm,
-                   "dpll_hw_state: cfgcr0: 0x%x, cfgcr1: 0x%x, div0: 0x%x, "
-                   "mg_refclkin_ctl: 0x%x, hg_clktop2_coreclkctl1: 0x%x, "
-                   "mg_clktop2_hsclkctl: 0x%x, mg_pll_div0: 0x%x, "
-                   "mg_pll_div2: 0x%x, mg_pll_lf: 0x%x, "
-                   "mg_pll_frac_lock: 0x%x, mg_pll_ssc: 0x%x, "
-                   "mg_pll_bias: 0x%x, mg_pll_tdc_coldst_bias: 0x%x\n",
-                   hw_state->cfgcr0, hw_state->cfgcr1,
-                   hw_state->div0,
-                   hw_state->mg_refclkin_ctl,
-                   hw_state->mg_clktop2_coreclkctl1,
-                   hw_state->mg_clktop2_hsclkctl,
-                   hw_state->mg_pll_div0,
-                   hw_state->mg_pll_div1,
-                   hw_state->mg_pll_lf,
-                   hw_state->mg_pll_frac_lock,
-                   hw_state->mg_pll_ssc,
-                   hw_state->mg_pll_bias,
-                   hw_state->mg_pll_tdc_coldst_bias);
+       drm_printf(p, "dpll_hw_state: cfgcr0: 0x%x, cfgcr1: 0x%x, div0: 0x%x, "
+                  "mg_refclkin_ctl: 0x%x, hg_clktop2_coreclkctl1: 0x%x, "
+                  "mg_clktop2_hsclkctl: 0x%x, mg_pll_div0: 0x%x, "
+                  "mg_pll_div2: 0x%x, mg_pll_lf: 0x%x, "
+                  "mg_pll_frac_lock: 0x%x, mg_pll_ssc: 0x%x, "
+                  "mg_pll_bias: 0x%x, mg_pll_tdc_coldst_bias: 0x%x\n",
+                  hw_state->cfgcr0, hw_state->cfgcr1, hw_state->div0,
+                  hw_state->mg_refclkin_ctl,
+                  hw_state->mg_clktop2_coreclkctl1,
+                  hw_state->mg_clktop2_hsclkctl,
+                  hw_state->mg_pll_div0,
+                  hw_state->mg_pll_div1,
+                  hw_state->mg_pll_lf,
+                  hw_state->mg_pll_frac_lock,
+                  hw_state->mg_pll_ssc,
+                  hw_state->mg_pll_bias,
+                  hw_state->mg_pll_tdc_coldst_bias);
 }
 
 static bool icl_compare_hw_state(const struct intel_dpll_hw_state *a,
@@ -4514,22 +4501,24 @@ void intel_dpll_sanitize_state(struct drm_i915_private *i915)
 }
 
 /**
- * intel_dpll_dump_hw_state - write hw_state to dmesg
+ * intel_dpll_dump_hw_state - dump hw_state
  * @i915: i915 drm device
- * @hw_state: hw state to be written to the log
+ * @p: where to print the state to
+ * @hw_state: hw state to be dumped
  *
- * Write the relevant values in @hw_state to dmesg using drm_dbg_kms.
+ * Dumo out the relevant values in @hw_state.
  */
 void intel_dpll_dump_hw_state(struct drm_i915_private *i915,
+                             struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state)
 {
        if (i915->display.dpll.mgr) {
-               i915->display.dpll.mgr->dump_hw_state(i915, hw_state);
+               i915->display.dpll.mgr->dump_hw_state(p, hw_state);
        } else {
                /* fallback for platforms that don't use the shared dpll
                 * infrastructure
                 */
-               ibx_dump_hw_state(i915, hw_state);
+               ibx_dump_hw_state(p, hw_state);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
index cc0e1386309dc666753ab6f876f76b63edec868b..d4d97e40440ade077af839aa6d87ab505c51c959 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
@@ -36,6 +36,7 @@
 
 enum tc_port;
 struct drm_i915_private;
+struct drm_printer;
 struct intel_atomic_state;
 struct intel_crtc;
 struct intel_crtc_state;
@@ -377,6 +378,7 @@ void intel_dpll_readout_hw_state(struct drm_i915_private *i915);
 void intel_dpll_sanitize_state(struct drm_i915_private *i915);
 
 void intel_dpll_dump_hw_state(struct drm_i915_private *i915,
+                             struct drm_printer *p,
                              const struct intel_dpll_hw_state *hw_state);
 bool intel_dpll_compare_hw_state(struct drm_i915_private *i915,
                                 const struct intel_dpll_hw_state *a,