> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Imre
> Deak
> Sent: Thursday, March 16, 2023 3:17 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Subject: [PATCH 06/14] drm/i915/tc: Factor out helpers converting
> HPD mask to TC mode
>
> Factor out helpers used later in the patchset to convert an HPD status mask to
> TC mode or target TC mode.
>
> No functional changes.
>
Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 44 ++++++++++++++++++-------
> 1 file changed, 33 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> b/drivers/gpu/drm/i915/display/intel_tc.c
> index 2116c82831a53..002e142cc746f 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -591,11 +591,28 @@ static void tc_phy_wait_for_ready(struct
> intel_digital_port *dig_port)
> dig_port->tc_port_name);
> }
>
> +static enum tc_port_mode
> +hpd_mask_to_tc_mode(u32 live_status_mask) {
> + if (live_status_mask)
> + return fls(live_status_mask) - 1;
> +
> + return TC_PORT_DISCONNECTED;
> +}
> +
> +static enum tc_port_mode
> +tc_phy_hpd_live_mode(struct intel_digital_port *dig_port) {
> + u32 live_status_mask = tc_port_live_status_mask(dig_port);
> +
> + return hpd_mask_to_tc_mode(live_status_mask);
> +}
> +
> static enum tc_port_mode
> intel_tc_port_get_current_mode(struct intel_digital_port *dig_port) {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> - u32 live_status_mask = tc_port_live_status_mask(dig_port);
> + enum tc_port_mode live_mode = tc_phy_hpd_live_mode(dig_port);
> enum tc_port_mode mode;
>
> /*
> @@ -611,27 +628,32 @@ intel_tc_port_get_current_mode(struct
> intel_digital_port *dig_port)
> return TC_PORT_TBT_ALT;
>
> mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY :
> TC_PORT_DP_ALT;
> - if (live_status_mask) {
> - enum tc_port_mode live_mode = fls(live_status_mask) - 1;
> -
> - if (!drm_WARN_ON(&i915->drm, live_mode ==
> TC_PORT_TBT_ALT))
> - mode = live_mode;
> - }
> + if (live_mode != TC_PORT_DISCONNECTED &&
> + !drm_WARN_ON(&i915->drm, live_mode == TC_PORT_TBT_ALT))
> + mode = live_mode;
>
> return mode;
> }
>
> static enum tc_port_mode
> -intel_tc_port_get_target_mode(struct intel_digital_port *dig_port)
> +hpd_mask_to_target_mode(u32 live_status_mask)
> {
> - u32 live_status_mask = tc_port_live_status_mask(dig_port);
> + enum tc_port_mode mode = hpd_mask_to_tc_mode(live_status_mask);
>
> - if (live_status_mask)
> - return fls(live_status_mask) - 1;
> + if (mode != TC_PORT_DISCONNECTED)
> + return mode;
>
> return TC_PORT_TBT_ALT;
> }
>
> +static enum tc_port_mode
> +intel_tc_port_get_target_mode(struct intel_digital_port *dig_port) {
> + u32 live_status_mask = tc_port_live_status_mask(dig_port);
> +
> + return hpd_mask_to_target_mode(live_status_mask);
> +}
> +
> static void intel_tc_port_reset_mode(struct intel_digital_port *dig_port,
> int required_lanes, bool force_disconnect) {
> --
> 2.37.1
