drm/i915/display: change who adds [] around crtc state dump context string

Add the brackets [] around crtc state dump context string in
intel_crtc_state_dump() so the callers don't have to.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c7d671279fb7d99eaf882bcb88c5c1d653755fb1.1655372759.git.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 1885098..35c6277 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
@@ -154,7 +154,7 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config,
        char buf[64];
        int i;
 
-       drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s] enable: %s %s\n",
+       drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s] enable: %s [%s]\n",
                    crtc->base.base.id, crtc->base.name,
                    str_yes_no(pipe_config->hw.enable), context);
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 2945b49..44bfc17 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7091,7 +7091,7 @@ static int intel_atomic_check(struct drm_device *dev,
 
                intel_crtc_state_dump(new_crtc_state, state,
                                      intel_crtc_needs_modeset(new_crtc_state) ?
-                                     "[modeset]" : "[fastset]");
+                                     "modeset" : "fastset");
        }
 
        return 0;
@@ -7106,7 +7106,7 @@ static int intel_atomic_check(struct drm_device *dev,
         */
        for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
                                            new_crtc_state, i)
-               intel_crtc_state_dump(new_crtc_state, state, "[failed]");
+               intel_crtc_state_dump(new_crtc_state, state, "failed");
 
        return ret;
 }
@@ -9595,7 +9595,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
                        to_intel_crtc_state(crtc->base.state);
 
                intel_sanitize_crtc(crtc, ctx);
-               intel_crtc_state_dump(crtc_state, NULL, "[setup_hw_state]");
+               intel_crtc_state_dump(crtc_state, NULL, "setup_hw_state");
        }
 
        intel_modeset_update_connector_atomic_state(dev);

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
index 0e2ed07..a91586d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
@@ -217,8 +217,8 @@ verify_crtc_state(struct intel_crtc *crtc,
        if (!intel_pipe_config_compare(new_crtc_state,
                                       pipe_config, false)) {
                I915_STATE_WARN(1, "pipe state doesn't match!\n");
-               intel_crtc_state_dump(pipe_config, NULL, "[hw state]");
-               intel_crtc_state_dump(new_crtc_state, NULL, "[sw state]");
+               intel_crtc_state_dump(pipe_config, NULL, "hw state");
+               intel_crtc_state_dump(new_crtc_state, NULL, "sw state");
        }
 }