On Wed, 31 May 2023, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Sprinkle some asserts to catch any mishaps in the port_mask
> vs. output init.
>
> For DDI/DP/HDMI/SDVO I decided that we want to bail out for
> an invalid port since those are the encoder types where
> we might want consider driving the whole thing from the VBT
> child device list, and bogus VBTs could be a real issue
> (if for no other reason than the i915.vbt_firmware).
>
> For DVO and HSW/BDW CRT port I just threw the assert in
> there for good measure.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
I've got increasingly mixed feelings about the assert_* naming,
including in the existing functions, because "assert" feels like it's
only there for debug builds.
Regardless, they should be all renamed in one go instead of forking
another naming lineage right here.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/g4x_dp.c | 3 +++
> drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +++
> drivers/gpu/drm/i915/display/intel_crt.c | 2 ++
> drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++
> drivers/gpu/drm/i915/display/intel_display.c | 6 ++++++
> drivers/gpu/drm/i915/display/intel_display.h | 2 ++
> drivers/gpu/drm/i915/display/intel_dvo.c | 2 ++
> drivers/gpu/drm/i915/display/intel_sdvo.c | 3 +++
> 8 files changed, 24 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index 112d91d81fdc..c58a3f249a01 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -1259,6 +1259,9 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv,
> struct drm_encoder *encoder;
> struct intel_connector *intel_connector;
>
> + if (!assert_port_valid(dev_priv, port))
> + return false;
> +
> devdata = intel_bios_encoder_data_lookup(dev_priv, port);
>
> /* FIXME bail? */
> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> index 5c187e6e0472..59704939c111 100644
> --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> @@ -667,6 +667,9 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv,
> struct intel_encoder *intel_encoder;
> struct intel_connector *intel_connector;
>
> + if (!assert_port_valid(dev_priv, port))
> + return;
> +
> devdata = intel_bios_encoder_data_lookup(dev_priv, port);
>
> /* FIXME bail? */
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index 673c03646696..643acf90e6d6 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -1062,6 +1062,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
> }
>
> if (HAS_DDI(dev_priv)) {
> + assert_port_valid(dev_priv, PORT_E);
> +
> crt->base.port = PORT_E;
> crt->base.get_config = hsw_crt_get_config;
> crt->base.get_hw_state = intel_ddi_get_hw_state;
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index d1a9a3cf94b5..31001b9a29b0 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4665,6 +4665,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> bool init_hdmi, init_dp;
> enum phy phy = intel_port_to_phy(dev_priv, port);
>
> + if (!assert_port_valid(dev_priv, port))
> + return;
> +
> /*
> * On platforms with HTI (aka HDPORT), if it's enabled at boot it may
> * have taken over some of the PHYs and made them unavailable to the
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 4f158c428937..d3fc498c82c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7371,6 +7371,12 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
> return true;
> }
>
> +bool assert_port_valid(struct drm_i915_private *i915, enum port port)
> +{
> + return !drm_WARN(&i915->drm, !(DISPLAY_RUNTIME_INFO(i915)->port_mask & BIT(port)),
> + "Platform does not support port %c\n", port_name(port));
> +}
> +
> void intel_setup_outputs(struct drm_i915_private *dev_priv)
> {
> struct intel_encoder *encoder;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index c744c021af23..53ca0e4e2357 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -539,6 +539,8 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
> #define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)
> #define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)
>
> +bool assert_port_valid(struct drm_i915_private *i915, enum port port);
> +
> /*
> * Use I915_STATE_WARN(x) (rather than WARN() and WARN_ON()) for hw state sanity
> * checks to check for unexpected conditions which may not necessarily be a user
> diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
> index 9884678743b6..b386894c3a6d 100644
> --- a/drivers/gpu/drm/i915/display/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_dvo.c
> @@ -509,6 +509,8 @@ void intel_dvo_init(struct drm_i915_private *i915)
> return;
> }
>
> + assert_port_valid(i915, intel_dvo->dev.port);
> +
> encoder->type = INTEL_OUTPUT_DVO;
> encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
> encoder->port = intel_dvo->dev.port;
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 34ee9dd82a78..6ed613558cf8 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -3330,6 +3330,9 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
> struct intel_sdvo *intel_sdvo;
> int i;
>
> + if (!assert_port_valid(dev_priv, port))
> + return false;
> +
> assert_sdvo_port_valid(dev_priv, port);
>
> intel_sdvo = kzalloc(sizeof(*intel_sdvo), GFP_KERNEL);
--
Jani Nikula, Intel Open Source Graphics Center
