Enable scrambling in SCDC only for TMDS mode. For FRL mode scrambling is handled as part of the FRL protocol and should not be configured via the TMDS scrambling path.
Signed-off-by: Ankit Nautiyal <[email protected]> --- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 18d4e79ac54c..b0534fba4e5f 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2430,7 +2430,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, pipe_config->lane_count = 4; - if (scdc->scrambling.supported && source_supports_scrambling(encoder)) { + if (scdc->scrambling.supported && source_supports_scrambling(encoder) && + !pipe_config->frl.enable) { if (scdc->scrambling.low_rates) pipe_config->hdmi_scrambling = true; -- 2.50.1
