Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Ankit Nautiyal" <ankit.k.nautiyal@intel.com>,
	intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 18/29] drm/i915/dp: Retrain the PCON FRL link from the link check work
Date: Fri, 20 Nov 2026 14:46:11 +0000	[thread overview]
Message-ID: <sashiko-outbox-225407@kernel.org> (raw)
In-Reply-To: <20261120140729.466177-19-ankit.k.nautiyal@intel.com>

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] drm/i915/dp: unlocked state and DPCD checks in
  intel_dp_pcon_frl_recover()
--

commit e23a19c1e92fb70f0e2a9ba0ff0a7c17fe7d9715
Author: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

drm/i915/dp: Retrain the PCON FRL link from the link check work

This commit defers PCON FRL link retraining on HDMI link status changes
from the short pulse handler to the encoder link check work, taking
modeset locks and checking for an active stream before retraining.

> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 05056d226fc11..3b8031cd5ef17 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -4463,6 +4463,42 @@ void intel_dp_check_frl_training(struct intel_dp *intel_dp)
>  	}
>  }
>  
> +/*
> + * Restart FRL training after the HDMI link went down while the stream is
> + * active, or fall back to TMDS mode.
> + */
> +int intel_dp_pcon_frl_recover(struct intel_encoder *encoder,
> +			      struct drm_modeset_acquire_ctx *ctx)
> +{
> +	struct intel_display *display = to_intel_display(encoder);
> +	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> +	u8 pipe_mask;
> +	int ret;
> +
> +	if (!(intel_dp->downstream_ports[2] & DP_PCON_SOURCE_CTL_MODE) ||
> +	    !intel_dp_is_hdmi_2_1_sink(intel_dp) ||
> +	    intel_dp->frl.is_trained ||
> +	    drm_dp_pcon_hdmi_link_active(&intel_dp->aux))
> +		return 0;
> +
> +	/* The connection mutex may be held already by the link retraining */
> +	ret = drm_modeset_lock(&display->drm->mode_config.connection_mutex, ctx);
> +	if (ret && ret != -EALREADY)
> +		return ret;
> +
> +	ret = intel_dp_get_active_pipes(intel_dp, ctx, &pipe_mask);
> +	if (ret)
> +		return ret;
> +
> +	/* Without an active stream the next enable trains the link */
> +	if (pipe_mask == 0)
> +		return 0;
> +
> +	intel_dp_check_frl_training(intel_dp);
> +
> +	return 0;
> +}

[Severity: Medium]
Should the PCON capability, frl.is_trained and
drm_dp_pcon_hdmi_link_active() checks run after locking connection_mutex
and calling intel_dp_get_active_pipes()?

When DP link retraining is not needed, intel_dp_retrain_link() returns
before calling intel_dp_get_active_pipes(), so CRTC locks are not held
and in-flight commits have not been waited on when
intel_dp_pcon_frl_recover() starts:

kworker (link_check_work)         modeset commit
intel_dp_pcon_frl_recover()
  frl.is_trained == false
  drm_dp_pcon_hdmi_link_active()
    -> false
                                  intel_dp_check_frl_training()
                                    FRL fails -> sets TMDS mode
                                    (frl.is_trained stays false,
                                     HDMI link becomes active)
  intel_dp_get_active_pipes()
    wait_for_connector_hw_done()
  intel_dp_check_frl_training()   <-- tears down active TMDS link

Running drm_dp_pcon_hdmi_link_active() before checking pipe_mask == 0 and
intel_dp_is_connected() also issues DPCD AUX reads when the stream is
disabled (sink in D3) or after the sink is unplugged, where
intel_dp_retrain_link() returns before locking connection_mutex.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261120140729.466177-1-ankit.k.nautiyal@intel.com?part=18

  reply	other threads:[~2026-11-20 14:46 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 14:07 [PATCH 00/29] DP-HDMI PCON DSC fixes Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 01/29] drm/i915/hdmi: Split the intel_hdmi_dsc_get_bpp() Ankit Nautiyal
2026-11-20 14:32   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 02/29] drm/i915/dp: Fix FRL BW check for HDMI2.1 DFP Ankit Nautiyal
2026-11-20 14:34   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 03/29] drm/i915/dp: Add a wrapper to check frl/tmds downstream constraints Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 04/29] drm/i915/dp: Use the common downstream bw check in compute_bpc Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 05/29] drm/i915/hdmi: Expose DSC min/max bpp helpers Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 06/29] drm/i915/hdmi: Add helper to check if DSC chunksize fits the sink limits Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 07/29] drm/i915/hdmi: Pass pixel clock to DSC slice helper Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 08/29] drm/i915/dp: Account for FRL 16b/18b encoding overhead Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 09/29] drm/i915/hdmi: Clamp the target_bpp only when it equals the link bpp Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 10/29] drm/i915/dp: Add PCON DSC state to crtc_state Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 11/29] drm/dp: Add a helper to disable the PCON DSC encoder Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 12/29] drm/i915/dp: Compute the PCON DSC operation Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 13/29] drm/i915/dp: Disable the PCON DSC encoder unless it is needed Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 14/29] drm/i915/dp: Clamp PCON DSC bpp to the FRL link bandwidth Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 15/29] drm/i915/dp: Add a helper for the DSC stream version Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 16/29] drm/i915/dp: Add a helper for the FRL payload bandwidth Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 17/29] drm/i915/dp: Compute the PCON DSC encoder parameters Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 18/29] drm/i915/dp: Retrain the PCON FRL link from the link check work Ankit Nautiyal
2026-11-20 14:46   ` sashiko-bot [this message]
2026-11-20 14:07 ` [PATCH 19/29] drm/i915/dp: Store the PCON FRL rate in the crtc state Ankit Nautiyal
2026-11-20 14:39   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 20/29] drm/i915/dp: Use the FRL rate of the stream on the HDMI link Ankit Nautiyal
2026-11-20 14:43   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 21/29] drm/i915/dp: Allow PCON DSC modes through the FRL bw check Ankit Nautiyal
2026-11-20 14:48   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 22/29] drm/i915/dp: Enable DSC pass-through in the PCON Ankit Nautiyal
2026-11-20 14:38   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 23/29] drm/i915/dp: Limit the DP link bpp for DSC pass-through to the FRL bandwidth Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 24/29] drm/i915/dp: Select DSC pass-through in the PCON for DSC 1.2a streams Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 25/29] drm/i915/dp: Allow limiting the DSC slice count for the downstream device Ankit Nautiyal
2026-11-20 14:41   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 26/29] drm/i915/dp: Check the HDMI sink slice limits for DSC pass-through Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 27/29] drm/i915/dp: Pick the DSC slice count for pass-through within the HDMI limits Ankit Nautiyal
2026-11-20 14:48   ` sashiko-bot
2026-11-20 14:07 ` [PATCH 28/29] drm/i915/dp: Limit the compressed bpp for pass-through to the HDMI sink Ankit Nautiyal
2026-11-20 14:07 ` [PATCH 29/29] drm/i915/dp: Accept DSC 1.2a pass-through modes in the PCON mode check Ankit Nautiyal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=sashiko-outbox-225407@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=ankit.k.nautiyal@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=sashiko-reviews@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox