From nobody Mon Feb 9 19:04:44 2026 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8363220E03F for ; Mon, 19 Jan 2026 01:12:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785149; cv=none; b=Ni4b9C4Tb+2KQrdHt7kbJxs63/UhA/Iw04Oyb17b+xif6kpA0WQpfRMZum08aphKKXcxhiL08QJnPSlDDKVGVB7Hujm6IvhpedEmC/VXqajGtOX5nbTvjzNdTkS4Fjj0UqO/grAcPgEBxdZqkGXu4iwVKdRC4ibMsQ/WR2hstkY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785149; c=relaxed/simple; bh=vCeNIrpSQnHAiIFw3AElk8d1M4LVBQRi4IODP++43PM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=esOCR03FL6tPEcDctzanJFcAdowYyUqqgloNgOqjSWE50ZS7bVCqu1F9lrO5Y6aSY0A/TFowmI9o/lcHJTroddEYKAU47BST1f7JlM2AmNAP0tnIVxpiikDziJEoAPSH7/8mYhd9WPbkHffAHucrEPivsqZEbUnAvy0toElvv+g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B2Tb0wV/; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B2Tb0wV/" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-64d0da6019fso364302a12.2 for ; Sun, 18 Jan 2026 17:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768785130; x=1769389930; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZSHN2Af/L95S4Os5yYFaV1hvvj2RmaOdeVqj+0nIWBY=; b=B2Tb0wV/rdPtvluP2NHqPMfDfmIptdLfL7Ab3JnKh7/yRESuWc5vjf16ulIjKO7pHQ 6v9OREUeacFZHf/A5Jfql7tBN6BMZPpnOKvU/tVSqywG/CqRi+iMXqegw7Ej4G2wuFBP AFFS+hfN1U2qEzew1zi7Jkm0WGiIfSy8XpL19ezcCIrDrFKklLKgTSRTgVNkGNhL4BHr mGV+NeNwYjnj8UIk5RR+a5HqN9+GQzOFyoq4O7jEa1VofxplNky1bLIP4IVJN89O9G5+ iJILHNh7MdOGcVFFY3BQA+UOUxh2cyhoH83d1wIsp/M8iMjbdpXQTUag/CUSH1DSGLvh Lv+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768785130; x=1769389930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZSHN2Af/L95S4Os5yYFaV1hvvj2RmaOdeVqj+0nIWBY=; b=X1eqijhTEpgOdLYz61ogK1pSvQmfCVc8GtKNttTa761Q88zBrWGBJ0zNne9RXL/E5G lEbTWI3EezXN3BwEqS/xuSuELUgZuZTNQPpM1xXZ+HrSE4fH7FZfVNcM45tKHrXbSG0R aLQJJR0e8rkfBKxW/jvQ3w0xpMowYPBQYvAShhNwcMIFGQGqEc7p7u8+1uxBiMecf1t8 QP5DRUtI9N2OiPWVkzgFj3vnFYrqb6BWyJlN4oCLtIXTL+EfsK+AfqA7+ncmnh1d7yvR wRos2AMyjh/wX4Amlwx9BYKl6LApGlyDNMHuuXseAu6ELwVUBYb7brCPg0vLbm5a57PJ l7sw== X-Forwarded-Encrypted: i=1; AJvYcCW7j+U/i5DNb62oQZTyuSp/Qqkvm7Q/tqYyYmF24+G78TuHMSU2e7EdF2IclRddV3VY5euJrrWXG5PhHqI=@vger.kernel.org X-Gm-Message-State: AOJu0YymGN7oP8XsC67mPcZ3PYjcHKMhw/6WI4w2ohMDXsjh/t3+DI1P Uxy+f/5CzOZUohvESiBJL0F5nZYKH1ImtqZo1W5s22RF7zI1K3Stzs55 X-Gm-Gg: AY/fxX6qRiNWH3rvAo0Z8IkHA9GGSYfbpedJL79oWg7DWqTPqAkwZHe9HLFwJ/V9by9 8APrEN/iEb5tHOyUrKUQatEYVnCv62qlznWEyf/sFyMkXyhvApVGyQ2U4hOvtcfuC74vSK/yIkR 7GwMwjFWFOJCoef3t4EnbMAvcEtlm2Oq013nUZOZzqi6E2eN2r1iFCUtysbuO/H9wjM9/pkoU1E XQRuAolUnU22j3+VhtnEi+t83OCReSG3ab9F/42GYJ8BHMBbfhMq9drT+Dw468mlfwUtIOhJPOH c5ZM/ahoPklQgnCDkWKPO65RdyHJ4v2d4O43zzdSCQ59gz8rRYUbBkQrWM9X/J1MYpdv05mwogg RouORoM+hyhAlRmMdqen2rcpsddmSHCn2NXegH4CG/Gu+7ll36zVNdY5WAp1/mptH5rV5fApAvr /8yIYKtmhw0kd3zCuZ3bYqD+zCgfSSvI8Gj4YhRCvrHiIoeyyUu1K7WpJTltkZr2xH0WLaw8XQC MM= X-Received: by 2002:a05:6402:350f:b0:649:5709:aafc with SMTP id 4fb4d7f45d1cf-65452cdaddemr4632382a12.7.1768785129599; Sun, 18 Jan 2026 17:12:09 -0800 (PST) Received: from laptok.lan (87-205-5-123.static.ip.netia.com.pl. [87.205.5.123]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-654535c4912sm8989806a12.30.2026.01.18.17.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 17:12:09 -0800 (PST) From: =?UTF-8?q?Tomasz=20Paku=C5=82a?= To: alexander.deucher@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, siqueira@igalia.com, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, tomasz.pakula.oficjalny@gmail.com, bernhard.berger@gmail.com Subject: [PATCH 14/17] drm/amd/display: Restore ALLM support in HDMI vsif Date: Mon, 19 Jan 2026 02:11:43 +0100 Message-ID: <20260119011146.62302-15-tomasz.pakula.oficjalny@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260119011146.62302-1-tomasz.pakula.oficjalny@gmail.com> References: <20260119011146.62302-1-tomasz.pakula.oficjalny@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable [Why] Support for triggering ALLM in modern TVs is missing. When HDMI vsif was added in 2019: commit 3c2381b92cba ("drm/amd/display: add support for VSIP info packet") it was improperly handeled as HDMI actually has two separate vsifs. The implementation was based on H14b-vsif and ALLM bit was messing it up because H14b-vsif doesn't support ALLM. It was later removed in: commit 75f77aafe281 ("drm/amd/display: Send H14b-VSIF specified in HDMI") ALLM is supported by hf-vsif (HDMI Forum) instead. [How] Add proper logic to construct either h14b-vsif or hf-vsif based on required capabilities. Currently, only ALLM from hf-vsif is supported. Turns out, hf-vsif is almost identical to h14b-vsif, BUT has additional two bytes of data after OUI. First byte is static and seems like a version supported by leftover define. Second byte consists of 3D and ALLM bits. Implement logic to offset 3D data if building hf-vsif. Signed-off-by: Tomasz Paku=C5=82a --- .../display/modules/info_packet/info_packet.c | 112 ++++++++++++------ 1 file changed, 73 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c = b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c index 294f56d20062..1a1ddcdb4362 100644 --- a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c +++ b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c @@ -49,7 +49,10 @@ enum vsc_packet_revision { }; =20 #define HDMI_INFOFRAME_TYPE_VENDOR 0x81 -#define HF_VSIF_VERSION 1 +#define HDMI_INFOFRAME_LENGTH_MASK 0x1F +#define HF_VSIF_VERSION 1 +#define HF_VSIF_3D_BIT 0 +#define HF_VSIF_ALLM_BIT 1 =20 // VTEM Byte Offset #define VTEM_PB0 0 @@ -496,9 +499,28 @@ void mod_build_vsc_infopacket(const struct dc_stream_s= tate *stream, } } =20 +static bool is_hdmi_vic_mode(const struct dc_stream_state *stream) +{ + bool allm =3D stream->link->local_sink->edid_caps.allm; + bool stereo =3D stream->view_format !=3D VIEW_3D_FORMAT_NONE; + + if (stream->timing.hdmi_vic =3D=3D 0) + return false; + + if (stream->timing.h_total < 3840 || + stream->timing.v_total < 2160) + return false; + + if (stereo || allm) + return false; + + return true; +} + /** * mod_build_hf_vsif_infopacket - Prepare HDMI Vendor Specific info frame. * Follows HDMI Spec to build up Vendor Sp= ecific info frame + * Conforms to h14b-vsif or hf-vsif based = on the capabilities * * @stream: contains data we may need to construct VSIF (i.e. timing= _3d_format, etc.) * @info_packet: output structure where to store VSIF @@ -506,63 +528,75 @@ void mod_build_vsc_infopacket(const struct dc_stream_= state *stream, void mod_build_hf_vsif_infopacket(const struct dc_stream_state *stream, struct dc_info_packet *info_packet) { - unsigned int length =3D 5; bool hdmi_vic_mode =3D false; + bool allm =3D false; + bool stereo =3D false; uint8_t checksum =3D 0; - uint32_t i =3D 0; + uint8_t offset =3D 0; + uint8_t i =3D 0; + uint8_t length =3D 5; + uint32_t oui =3D HDMI_IEEE_OUI; enum dc_timing_3d_format format; =20 info_packet->valid =3D false; + format =3D stream->timing.timing_3d_format; if (stream->view_format =3D=3D VIEW_3D_FORMAT_NONE) format =3D TIMING_3D_FORMAT_NONE; + stereo =3D format !=3D TIMING_3D_FORMAT_NONE; + hdmi_vic_mode =3D is_hdmi_vic_mode(stream); =20 - if (stream->timing.hdmi_vic !=3D 0 - && stream->timing.h_total >=3D 3840 - && stream->timing.v_total >=3D 2160 - && format =3D=3D TIMING_3D_FORMAT_NONE) - hdmi_vic_mode =3D true; - - if ((format =3D=3D TIMING_3D_FORMAT_NONE) && !hdmi_vic_mode) + if (!stereo && !hdmi_vic_mode && !allm) return; =20 - info_packet->sb[1] =3D 0x03; - info_packet->sb[2] =3D 0x0C; - info_packet->sb[3] =3D 0x00; + if (allm) + oui =3D HDMI_FORUM_IEEE_OUI; =20 - if (format !=3D TIMING_3D_FORMAT_NONE) - info_packet->sb[4] =3D (2 << 5); + info_packet->sb[1] =3D oui & 0xff; + info_packet->sb[2] =3D (oui >> 8) & 0xff; + info_packet->sb[3] =3D (oui >> 16) & 0xff; =20 - else if (hdmi_vic_mode) - info_packet->sb[4] =3D (1 << 5); - - switch (format) { - case TIMING_3D_FORMAT_HW_FRAME_PACKING: - case TIMING_3D_FORMAT_SW_FRAME_PACKING: - info_packet->sb[5] =3D (0x0 << 4); - break; - - case TIMING_3D_FORMAT_SIDE_BY_SIDE: - case TIMING_3D_FORMAT_SBS_SW_PACKED: - info_packet->sb[5] =3D (0x8 << 4); - length =3D 6; - break; - - case TIMING_3D_FORMAT_TOP_AND_BOTTOM: - case TIMING_3D_FORMAT_TB_SW_PACKED: - info_packet->sb[5] =3D (0x6 << 4); - break; - - default: - break; + if (oui =3D=3D HDMI_FORUM_IEEE_OUI) { + offset =3D 2; + length +=3D 2; + info_packet->sb[4] =3D HF_VSIF_VERSION; + info_packet->sb[5] =3D stereo << HF_VSIF_3D_BIT; + info_packet->sb[5] =3D allm << HF_VSIF_ALLM_BIT; } =20 - if (hdmi_vic_mode) + if (stereo) { + info_packet->sb[4 + offset] =3D (2 << 5); + + switch (format) { + case TIMING_3D_FORMAT_HW_FRAME_PACKING: + case TIMING_3D_FORMAT_SW_FRAME_PACKING: + info_packet->sb[5 + offset] =3D (0x0 << 4); + break; + + case TIMING_3D_FORMAT_SIDE_BY_SIDE: + case TIMING_3D_FORMAT_SBS_SW_PACKED: + info_packet->sb[5 + offset] =3D (0x8 << 4); + ++length; + break; + + case TIMING_3D_FORMAT_TOP_AND_BOTTOM: + case TIMING_3D_FORMAT_TB_SW_PACKED: + info_packet->sb[5 + offset] =3D (0x6 << 4); + break; + + default: + break; + } + + /* Doesn't need the offset as it can't be used with hf-vsif */ + } else if (hdmi_vic_mode) { + info_packet->sb[4] =3D (1 << 5); info_packet->sb[5] =3D stream->timing.hdmi_vic; + } =20 info_packet->hb0 =3D HDMI_INFOFRAME_TYPE_VENDOR; info_packet->hb1 =3D 0x01; - info_packet->hb2 =3D (uint8_t) (length); + info_packet->hb2 =3D length & HDMI_INFOFRAME_LENGTH_MASK; =20 checksum +=3D info_packet->hb0; checksum +=3D info_packet->hb1; --=20 2.52.0