On Thu, Sep 09, 2021 at 03:51:57PM +0300, Jani Nikula wrote:
> Unfortunately, the DP 2.0 128b/132b DDI mode selection in the register
> conflicts with FDI. Since we have to deal with both meanings in the same
> code, for different platforms, clarify the macro name so we don't
> forget.
>
> Bspec: 50493
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 6 +++---
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 23ef291f7b30..2361f48537b5 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -489,7 +489,7 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder,
> 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)) {
> - temp |= TRANS_DDI_MODE_SELECT_FDI;
> + temp |= TRANS_DDI_MODE_SELECT_FDI_OR_128B132B;
> temp |= (crtc_state->fdi_lanes - 1) << 1;
> } else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) {
> temp |= TRANS_DDI_MODE_SELECT_DP_MST;
> @@ -679,7 +679,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
> ret = false;
> break;
>
> - case TRANS_DDI_MODE_SELECT_FDI:
> + case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B:
> ret = type == DRM_MODE_CONNECTOR_VGA;
> break;
>
> @@ -3558,7 +3558,7 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder,
> pipe_config->output_types |= BIT(INTEL_OUTPUT_HDMI);
> pipe_config->lane_count = 4;
> break;
> - case TRANS_DDI_MODE_SELECT_FDI:
> + case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B:
> pipe_config->output_types |= BIT(INTEL_OUTPUT_ANALOG);
> break;
> case TRANS_DDI_MODE_SELECT_DP_SST:
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index c2853cc005ee..03a94389c514 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -10202,7 +10202,7 @@ enum skl_power_gate {
> #define TRANS_DDI_MODE_SELECT_DVI (1 << 24)
> #define TRANS_DDI_MODE_SELECT_DP_SST (2 << 24)
> #define TRANS_DDI_MODE_SELECT_DP_MST (3 << 24)
> -#define TRANS_DDI_MODE_SELECT_FDI (4 << 24)
> +#define TRANS_DDI_MODE_SELECT_FDI_OR_128B132B (4 << 24)
> #define TRANS_DDI_BPC_MASK (7 << 20)
> #define TRANS_DDI_BPC_8 (0 << 20)
> #define TRANS_DDI_BPC_10 (1 << 20)
> --
> 2.30.2
--
Ville Syrjälä
Intel
