On Thu, 05 Jan 2023, Ankit Nautiyal wrote:
> Defeature Display Interlace support.
> Support for interlace modes is removed from Gen 12 onwards.
> Pruning the interlace modes for HDMI for Display >=12.
> Bspec: 50490
>
> v2: Add check for both DP and HDMI. (Ville)
> Get rid of redundant check for interlace mode in modevalid. (Ville)
>
> v3: Simplify the condition to avoid interlace modes. (Jani)
>
> Signed-off-by: Ankit Nautiyal
Reviewed-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +++-
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index a9ebc73d3b87..c03a11173dc8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2092,7 +2092,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
> return -EINVAL;
>
> - if (HAS_GMCH(dev_priv) &&
> + if (!connector->base.interlace_allowed &&
> adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
> return -EINVAL;
>
> @@ -5435,7 +5435,7 @@ intel_dp_init_connector(struct intel_digital_port
> *dig_port,
> drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
> drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);
>
> - if (!HAS_GMCH(dev_priv))
> + if (!HAS_GMCH(dev_priv) && DISPLAY_VER(dev_priv) < 12)
> connector->interlace_allowed = true;
>
> intel_connector->polled = DRM_CONNECTOR_POLL_HPD;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index b4323303baba..6a2ee342eab5 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2255,6 +2255,10 @@ int intel_hdmi_compute_config(struct intel_encoder
> *encoder,
> if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
> return -EINVAL;
>
> + if (!connector->interlace_allowed &&
> + adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
> + return -EINVAL;
> +
> pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
> pipe_config->has_hdmi_sink =
> intel_has_hdmi_sink(intel_hdmi, conn_state) &&
> @@ -2956,7 +2960,9 @@ void intel_hdmi_init_connector(struct
> intel_digital_port *dig_port,
> ddc);
> drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
>
> - connector->interlace_allowed = true;
> + if (DISPLAY_VER(dev_priv) < 12)
> + connector->interlace_allowed = true;
> +
> connector->stereo_allowed = true;
>
> if (DISPLAY_VER(dev_priv) >= 10)
--
Jani Nikula, Intel Open Source Graphics Center
