diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-06-16 12:48:13 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-06-17 11:54:53 +0300 |
| commit | 109406c92f971e739af04b278ef75dd0fee68a40 (patch) | |
| tree | 54d9a3bdb19f9b664b6a4fb5574bbc62c9d13948 | |
| parent | f0978e92c2f7e9a38fa05d30a3e901d16a30698a (diff) | |
| download | linux-109406c92f971e739af04b278ef75dd0fee68a40.tar.xz | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 0d1217c9798e..b2232d042841 100644 --- 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); |