> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Imre
> Deak
> Sent: Thursday, March 23, 2023 4:20 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Subject: [PATCH 02/29] drm/i915/tc: Use the adlp prefix for ADLP TC
> PHY functions
>
> Use the usual adlp prefix for all ADLP specific TC PHY functions. Other ADL
> platforms don't support TC.
>
Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> b/drivers/gpu/drm/i915/display/intel_tc.c
> index b6e425c44fcb9..099b1ec842ba2 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -457,7 +457,7 @@ static void icl_tc_phy_disconnect(struct
> intel_digital_port *dig_port)
> * ADLP TC PHY handlers
> * --------------------
> */
> -static u32 adl_tc_port_live_status_mask(struct intel_digital_port *dig_port)
> +static u32 adlp_tc_port_live_status_mask(struct intel_digital_port
> +*dig_port)
> {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port);
> @@ -492,7 +492,7 @@ static u32 adl_tc_port_live_status_mask(struct
> intel_digital_port *dig_port)
> * DP-alt, legacy or nothing). For TBT-alt sinks the PHY is owned by the TBT
> * subsystem and so switching the ownership to display is not required.
> */
> -static bool adl_tc_phy_status_complete(struct intel_digital_port *dig_port)
> +static bool adlp_tc_phy_status_complete(struct intel_digital_port
> +*dig_port)
> {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port);
> @@ -509,8 +509,8 @@ static bool adl_tc_phy_status_complete(struct
> intel_digital_port *dig_port)
> return val & TCSS_DDI_STATUS_READY;
> }
>
> -static bool adl_tc_phy_take_ownership(struct intel_digital_port *dig_port,
> - bool take)
> +static bool adlp_tc_phy_take_ownership(struct intel_digital_port *dig_port,
> + bool take)
> {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> enum port port = dig_port->base.port;
> @@ -521,7 +521,7 @@ static bool adl_tc_phy_take_ownership(struct
> intel_digital_port *dig_port,
> return true;
> }
>
> -static bool adl_tc_phy_is_owned(struct intel_digital_port *dig_port)
> +static bool adlp_tc_phy_is_owned(struct intel_digital_port *dig_port)
> {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> enum port port = dig_port->base.port;
> @@ -540,7 +540,7 @@ static u32 tc_port_live_status_mask(struct
> intel_digital_port *dig_port)
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
>
> if (IS_ALDERLAKE_P(i915))
> - return adl_tc_port_live_status_mask(dig_port);
> + return adlp_tc_port_live_status_mask(dig_port);
>
> return icl_tc_port_live_status_mask(dig_port);
> }
> @@ -550,7 +550,7 @@ static bool tc_phy_status_complete(struct
> intel_digital_port *dig_port)
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
>
> if (IS_ALDERLAKE_P(i915))
> - return adl_tc_phy_status_complete(dig_port);
> + return adlp_tc_phy_status_complete(dig_port);
>
> return icl_tc_phy_status_complete(dig_port);
> }
> @@ -560,7 +560,7 @@ static bool tc_phy_is_owned(struct intel_digital_port
> *dig_port)
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
>
> if (IS_ALDERLAKE_P(i915))
> - return adl_tc_phy_is_owned(dig_port);
> + return adlp_tc_phy_is_owned(dig_port);
>
> return icl_tc_phy_is_owned(dig_port);
> }
> @@ -570,7 +570,7 @@ static bool tc_phy_take_ownership(struct
> intel_digital_port *dig_port, bool take
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
>
> if (IS_ALDERLAKE_P(i915))
> - return adl_tc_phy_take_ownership(dig_port, take);
> + return adlp_tc_phy_take_ownership(dig_port, take);
>
> return icl_tc_phy_take_ownership(dig_port, take); }
> --
> 2.37.1
