]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/ddi: Guard reg_val against a INVALID_TRANSCODER
authorSuraj Kandpal <suraj.kandpal@intel.com>
Mon, 8 Sep 2025 04:22:08 +0000 (09:52 +0530)
committerTvrtko Ursulin <tursulin@ursulin.net>
Tue, 23 Sep 2025 07:52:18 +0000 (08:52 +0100)
Currently we check if the encoder is INVALID or -1 and throw a
WARN_ON but we still end up writing the temp value which will
overflow and corrupt the whole programmed value.

--v2
-Assign a bogus transcoder to master in case we get a INVALID
TRANSCODER [Jani]

Fixes: 6671c367a9bea ("drm/i915/tgl: Select master transcoder for MST stream")
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250908042208.1011144-1-suraj.kandpal@intel.com
(cherry picked from commit c8e8e9ab14a6ea926641d161768e1e3ef286a853)
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
drivers/gpu/drm/i915/display/intel_ddi.c

index 0405396c7750eaf40dd35e25327b2d282c208c28..9ecbb4b99c3786edef5046984c5ce709eeeb34f2 100644 (file)
@@ -596,8 +596,9 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder,
                        enum transcoder master;
 
                        master = crtc_state->mst_master_transcoder;
-                       drm_WARN_ON(display->drm,
-                                   master == INVALID_TRANSCODER);
+                       if (drm_WARN_ON(display->drm,
+                                       master == INVALID_TRANSCODER))
+                               master = TRANSCODER_A;
                        temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master);
                }
        } else {