Commit 8aa940c8 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Add hardware readout for FEC 



Readout the FEC state in encoder->get_config(), this will allow
us to ensure that we can correctly inherit the state from boot,
and that we set FEC during modeset.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190925082110.17439-2-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent ed06efb8

drivers/gpu/drm/i915/display/intel_ddi.c

+17 −0
Original line number Diff line number Diff line
@@ -4021,6 +4021,23 @@ void intel_ddi_get_config(struct intel_encoder *encoder, 
		pipe_config->lane_count =

			((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;

		intel_dp_get_m_n(intel_crtc, pipe_config);



		if (INTEL_GEN(dev_priv) >= 11) {

			i915_reg_t dp_tp_ctl;



			if (IS_GEN(dev_priv, 11))

				dp_tp_ctl = DP_TP_CTL(encoder->port);

			else

				dp_tp_ctl = TGL_DP_TP_CTL(pipe_config->cpu_transcoder);



			pipe_config->fec_enable =

				I915_READ(dp_tp_ctl) & DP_TP_CTL_FEC_ENABLE;



			DRM_DEBUG_KMS("[ENCODER:%d:%s] Fec status: %u\n",

				      encoder->base.base.id, encoder->base.name,

				      pipe_config->fec_enable);

		}



		break;

	case TRANS_DDI_MODE_SELECT_DP_MST:

		pipe_config->output_types |= BIT(INTEL_OUTPUT_DP_MST);

drivers/gpu/drm/i915/display/intel_display.c

+1 −0
Original line number Diff line number Diff line
@@ -12836,6 +12836,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	PIPE_CONF_CHECK_BOOL(hdmi_scrambling);

	PIPE_CONF_CHECK_BOOL(hdmi_high_tmds_clock_ratio);

	PIPE_CONF_CHECK_BOOL(has_infoframe);

	PIPE_CONF_CHECK_BOOL(fec_enable);



	PIPE_CONF_CHECK_BOOL_INCOMPLETE(has_audio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE