> -----Original Message-----
> From: Intel-gfx <intel-gfx-boun...@lists.freedesktop.org> On Behalf Of Ankit
> Nautiyal
> Sent: Wednesday, 3 September 2025 6.50
> To: intel-gfx@lists.freedesktop.org; intel...@lists.freedesktop.org
> Cc: Nautiyal, Ankit K <ankit.k.nauti...@intel.com>
> Subject: [PATCH] drm/i915/hdmi: Fix potential overflow while using
> intel_encoder_to_tc
>
> The helper intel_encoder_to_tc() can potentially return TC_PORT_NONE
> (-1) and cause overflow while computing ddc pins in icl_encoder_to_ddc_pin().
>
> Check for TC_PORT_NONE before deriving the ddc pins for TC port.
>
Reviewed-by: Mika Kahola <mika.kah...@intel.com>
> Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index cbee628eb26b..85f70cedc40c 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2791,10 +2791,16 @@ static u8 icl_encoder_to_ddc_pin(struct intel_encoder
> *encoder)
> struct intel_display *display = to_intel_display(encoder);
> enum port port = encoder->port;
>
> - if (intel_encoder_is_combo(encoder))
> + if (intel_encoder_is_combo(encoder)) {
> return GMBUS_PIN_1_BXT + port;
> - else if (intel_encoder_is_tc(encoder))
> - return GMBUS_PIN_9_TC1_ICP + intel_encoder_to_tc(encoder);
> + } else if (intel_encoder_is_tc(encoder)) {
> + enum tc_port tc_port = intel_encoder_to_tc(encoder);
> +
> + if (tc_port != TC_PORT_NONE)
> + return GMBUS_PIN_9_TC1_ICP + tc_port;
> +
> + drm_WARN(display->drm, 1, "Invalid TC port\n");
> + }
>
> drm_WARN(display->drm, 1, "Unknown port:%c\n", port_name(port));
> return GMBUS_PIN_2_BXT;
> --
> 2.45.2
