Attachment 142162 Details for Bug 107896 – HDMI 2.0 scrambling enable/disable fix

[patch] HDMI 2.0 scrambling enable/disable fix

scrambling_cts_HF1-13.diff (text/plain), 1.52 KB, created by Clinton Taylor on 2018-10-23 18:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clinton Taylor

Created: 2018-10-23 18:57:40 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>index 47960c9..a148684 100644
>--- a/drivers/gpu/drm/i915/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/intel_ddi.c
>@@ -1872,7 +1872,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
> 			temp |= TRANS_DDI_MODE_SELECT_DVI;
> 
> 		if (crtc_state->hdmi_scrambling)
>-			temp |= TRANS_DDI_HDMI_SCRAMBLING_MASK;
>+			temp |= TRANS_DDI_HDMI_SCRAMBLING;
> 		if (crtc_state->hdmi_high_tmds_clock_ratio)
> 			temp |= TRANS_DDI_HIGH_TMDS_CHAR_RATE;
> 	} else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) {
>@@ -3394,8 +3394,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
> 		if (intel_dig_port->infoframe_enabled(encoder, pipe_config))
> 			pipe_config->has_infoframe = true;
> 
>-		if ((temp & TRANS_DDI_HDMI_SCRAMBLING_MASK) ==
>-			TRANS_DDI_HDMI_SCRAMBLING_MASK)
>+		if (temp & TRANS_DDI_HDMI_SCRAMBLING)
> 			pipe_config->hdmi_scrambling = true;
> 		if (temp & TRANS_DDI_HIGH_TMDS_CHAR_RATE)
> 			pipe_config->hdmi_high_tmds_clock_ratio = true;
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>index 6913806..3f45ef5 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -1913,6 +1913,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> 		intel_gmbus_force_bit(i2c, false);
> 	}
> 
>+	drm_connector_update_edid_property(connector, edid);
>+
> 	intel_hdmi_dp_dual_mode_detect(connector, edid != NULL);
> 
> 	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);

Actions: View | Splinter Review

Attachments on bug 107896: 141516 | 141556 | 141841 | 142162

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.