drm/i915/adl_p: Same slices mask is not same Dbuf state

We currently treat same slice mask as a same DBuf state and skip
updating the Dbuf slices, if we detect that.
This is wrong as if we have a multi to single pipe change or
vice versa, that would be treated as a same Dbuf state and thus
no changes required, so we don't get Mbus updated, causing issues.
Solution: check also mbus_join, in addition to slices mask.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210527110106.21434-1-stanislav.lisovskiy@intel.com

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 7ce9537fa2c7342721c81eb9cd427e212fb34a6c..45fefa0ed16070374f4af4b8d5734ce3f532fa6d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -8093,7 +8093,8 @@ void intel_dbuf_pre_plane_update(struct intel_atomic_state *state)
                intel_atomic_get_old_dbuf_state(state);
 
        if (!new_dbuf_state ||
-           new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+           ((new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+           && (new_dbuf_state->joined_mbus == old_dbuf_state->joined_mbus)))
                return;
 
        WARN_ON(!new_dbuf_state->base.changed);
@@ -8113,7 +8114,8 @@ void intel_dbuf_post_plane_update(struct intel_atomic_state *state)
                intel_atomic_get_old_dbuf_state(state);
 
        if (!new_dbuf_state ||
-           new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+           ((new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+           && (new_dbuf_state->joined_mbus == old_dbuf_state->joined_mbus)))
                return;
 
        WARN_ON(!new_dbuf_state->base.changed);