]> www.infradead.org Git - users/hch/misc.git/commit
drm/i915/dp_mst: Fix encoder HW state readout for UHBR MST
authorImre Deak <imre.deak@intel.com>
Mon, 24 Feb 2025 09:32:42 +0000 (11:32 +0200)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 26 Feb 2025 13:16:23 +0000 (08:16 -0500)
commit16fef33fdb1e2269c20697d9b61ae8022bc92665
tree99ba3e4689734a1d98bcea74388502079fbf8700
parentd082ecbc71e9e0bf49883ee4afd435a77a5101b6
drm/i915/dp_mst: Fix encoder HW state readout for UHBR MST

The encoder HW/SW state verification should use a SW state which stays
unchanged while the encoder/output is active. The intel_dp::is_mst flag
used during state computation to choose between the DP SST/MST modes can
change while the output is active, if the sink gets disconnected or the
MST topology is removed for another reason. A subsequent state
verification using intel_dp::is_mst leads then to a mismatch if the
output is disabled/re-enabled without recomputing its state.

Use the encoder's active MST link count instead, which will be always
non-zero for an active MST output and will be zero for SST.

Fixes: 35d2e4b75649 ("drm/i915/ddi: start distinguishing 128b/132b SST and MST at state readout")
Fixes: 40d489fac0e8 ("drm/i915/ddi: handle 128b/132b SST in intel_ddi_read_func_ctl()")
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250224093242.1859583-1-imre.deak@intel.com
(cherry picked from commit 0159e311772af9d6598aafe072c020687720f1d7)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_ddi.c