Handle the TypeC PHY on port B case while mapping the port to an HPD pin. This prepares for an upcoming change that will set port B's PHY type to TypeC on PTL+ platforms with an eDP panel connected to a TypeC PHY. Keep the existing port >= PORT_TC1 case and its HPD pin mapping for DG2, where PORT_TC1 has a non-TypeC PHY. CC: stable@vger.kernel.org # 6.14+ Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/display/intel_ddi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index dda95709c7c73..5950246e45a06 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -5053,6 +5053,8 @@ static enum hpd_pin xelpd_hpd_pin(struct intel_display *display, enum port port) return HPD_PORT_D + port - PORT_D_XELPD; else if (port >= PORT_TC1) return HPD_PORT_TC1 + port - PORT_TC1; + else if (intel_phy_is_tc(display, intel_port_to_phy(display, port))) + return HPD_PORT_TC1 + intel_port_to_tc(display, port) - TC_PORT_1; else return HPD_PORT_A + port - PORT_A; } -- 2.49.1