drm/i915/mpllb: use I915_STATE_WARN() for state mismatch warnings

The pipe_config_mismatch() function is primarily for logging comparison
results.

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/167e54e13a9a41c944910a274e79cbfd39d963b1.1655372759.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 0d1217c9798e9634022ebecd1853effc423ab727..b2232d042841eb40f37fa0dc30283355c1ff15e9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6601,14 +6601,12 @@ verify_mpllb_state(struct intel_atomic_state *state,
        encoder = intel_get_crtc_new_encoder(state, new_crtc_state);
        intel_mpllb_readout_hw_state(encoder, &mpllb_hw_state);
 
-#define MPLLB_CHECK(name) do { \
-       if (mpllb_sw_state->name != mpllb_hw_state.name) { \
-               pipe_config_mismatch(false, crtc, "MPLLB:" __stringify(name), \
-                                    "(expected 0x%08x, found 0x%08x)", \
-                                    mpllb_sw_state->name, \
-                                    mpllb_hw_state.name); \
-       } \
-} while (0)
+#define MPLLB_CHECK(__name)                                            \
+       I915_STATE_WARN(mpllb_sw_state->__name != mpllb_hw_state.__name,        \
+                       "[CRTC:%d:%s] mismatch in MPLLB: %s (expected 0x%08x, found 0x%08x)", \
+                       crtc->base.base.id, crtc->base.name,            \
+                       __stringify(__name),                            \
+                       mpllb_sw_state->__name, mpllb_hw_state.__name)
 
        MPLLB_CHECK(mpllb_cp);
        MPLLB_CHECK(mpllb_div);