From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 48D8837D11E for ; Sun, 15 Mar 2026 22:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773614098; cv=none; b=CHxmlTqMVMzh2ao3j5CdlaX0NInkZlPktywf8qQbHBoybDK8aUdB3hAJVCcp2q1FNOT6UKkN92KhtsJ0pvNexXs+knQa2F6uGU7mUyhcJImsAc0NuoY4DxR7BrjLWNGXZYwT41ECB7zSDRko6Kieq+dKZ8mQBbRKfu9XqRTXlbc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773614098; c=relaxed/simple; bh=a1rfQ9eoqQwvDN+gnvVG12lUWOiPMAPItr+b+n9sCjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cfhhRJknxGAdpS+MNKjax5iDmLaEd6TzmBt72667f7KoijodqqF86N6X55RCCPxwHG3WqSnuQmnCF+vnlb+5B6ctud7ahdG3hn9h3N4eZA89cOa9KFJ3p/B44C/avv/2FELfX8kq1vqRDZoo3NhmpJBzA0ObjniRbMtU2CSd9a4= 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=MMXFNm9z; arc=none smtp.client-ip=209.85.128.48 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="MMXFNm9z" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4852ff06541so44344715e9.2 for ; Sun, 15 Mar 2026 15:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773614096; x=1774218896; 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=jQzZONnM4aIeZD+RlnEew9gmqoqVacuTTfndGoL0Obc=; b=MMXFNm9znAueoSrJ5dneClAs3uWE5sh/PR3VqFVJQicTA4qUIxdihgF7YjoT3uDu8d WoUVRnTXyd1ddUzvltqLrI4ziJZ8H+X9So/M4GIqijSMzHS4dk7BZN2ASMev17zh618A 94NVxjlVDxYJ3qjh3vuAIrF5xPKIKFv1RP0q5z7s6N7YSK8oTAXo6JUYje+IxDXNiEZO DQccuGbYWbtbyH8WwrH9Zo1A87jAaHMkcJec+t4nMgf8nfC4vKf1TV4LK2TBjGzFOf8N AFiTn3V3yUXtvcHf+6031zeA+QfqvDAaLQ2LSAmhTNoau4iR/JfQczWuf9CaMlvWeUK0 G6aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773614096; x=1774218896; 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=jQzZONnM4aIeZD+RlnEew9gmqoqVacuTTfndGoL0Obc=; b=AkCLFmOK4/e115AvnF59iIbmQ8wM8MCLB584hvJmxuqlu2zG5gMxp2oDn2sA//ge/7 MBQDPE/YsVHjffX6kMsF/qkNiYzmQ56k+NrPGx35t+iP+basRMmLlEs88ctyB0Df55+l AqYghV2TaA1CoEQwBOiiwk66xw1+dnR5JOS7smAc5eI3C7qGMuxij698ZDgRi+qFZ/cr pt94p0AvG4PbRx2X9veqgspQWaFmQpHx5LKprvxA1oUMyU33r3IfhuvJvsZYHWdeE3xu t4zpc0P9oRTtnzETBHJXSzFj1hX4zuY5FPLxaF+5zHH8pYLAl/FWdzDBO7veHC2EBOqP MIhg== X-Forwarded-Encrypted: i=1; AJvYcCVAcDk7rSdvcJLme4ucOg39xsduAyBkZW16Vwr0k3NfjrJOwPdPZuWriOjnPTyxZSxveZ/nuvltolOa77s=@vger.kernel.org X-Gm-Message-State: AOJu0YyV96lRdtyEM/lx+tMh/5QlQw8eUuyMXXPeIwQ4Az4kW8aKGxdX HiC+UAXnPQHQk4/NgPXbX0CGqaFkK6IPqCkJPuLrQUxoxBxkpP1xUc7/ X-Gm-Gg: ATEYQzzm67BXoFyU7aj275M1rW8gSfnqjBt2hFJbOsDEICRvFdc6YDT/JrMZnPoLKbW 0ihGY9Zyezhh5ZhcgE3gEIbufHKuHO3r8ibLoAs6e1vWlUM3Fy7rnhr2FzgqwanvtvU9UHEDe0F OSQsMjTQm5PgvHA4zJPwIA64V02R39VyIkP3htnVctOeN6OzKGqisVVqhyIirumPYzvs3GUmJ7m o1NJI31j2K/dH829AWxFybeMa7FlRbhbAuWqnIqKaP4D4G4K2SGiiZaXZ6uEop0sHbNA97VzKb7 Jaj9A/k6V1i9xCauTNG3rOkb37XBg1RhsQPgU/+5zfaNi2Nm1uwTUE3SBCdHbesoASR7NhXYlWq wFEuyhSTFXAeuRfTmK0B5jnagiipzQjXvGLFt0jC9PbI+3H9LD0U9CsPkdhvmrEG4FGQSArm6EM zgVZNppgvKq/Pjutbxj8OFH4S8C/Hyz+VG1A0oyE9GkvTB5sFgCNpsYOUqK8wwV3i8p3hOXGyUj UP5B98wfllBzEy2+Ogg X-Received: by 2002:a05:600c:468e:b0:485:3f58:d9d with SMTP id 5b1f17b1804b1-48556714b67mr178951105e9.32.1773614095582; Sun, 15 Mar 2026 15:34:55 -0700 (PDT) Received: from localhost (p200300eba70b6e00ca7f54fffe019321.dip0.t-ipconnect.de. [2003:eb:a70b:6e00:ca7f:54ff:fe01:9321]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aa73dasm1128568445e9.2.2026.03.15.15.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 15:34:55 -0700 (PDT) From: =?UTF-8?q?Johannes=20W=C3=BCller?= To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Johannes=20W=C3=BCller?= , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/4] drm/amd: fix HDMI signal type for EDID overrides Date: Sun, 15 Mar 2026 23:33:04 +0100 Message-ID: <20260315223307.45807-3-johanneswueller@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260315223307.45807-1-johanneswueller@gmail.com> References: <20260315223307.45807-1-johanneswueller@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: 8bit If an EDID override is in effect (e.g. via debugfs edid_override or drm.edid_firmware kernel parameter), the overriding EDID may not advertise capabilities matching the physical connector being used. In that case, trust the physical connector type over the EDID in create_eml_sink() and dm_helpers_parse_edid_caps(). Signed-off-by: Johannes Wüller --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ff09a5371cb2..bc853f7555a9 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7911,7 +7911,14 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector) return; } - if (connector->display_info.is_hdmi) + /* + * If an EDID override is active, it may not advertise HDMI capability + * even though the physical connector is HDMI. Trust the connector type. + */ + if (connector->display_info.is_hdmi || + (connector->edid_overridden && + (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))) init_params.sink_signal = SIGNAL_TYPE_HDMI_TYPE_A; aconnector->drm_edid = drm_edid; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d7b0b84b3865..36b6e37f1517 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -137,7 +137,14 @@ enum dc_edid_status dm_helpers_parse_edid_caps( edid_caps->display_name, AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS); - edid_caps->edid_hdmi = connector->display_info.is_hdmi; + /* + * If an EDID override is active, it may not advertise HDMI capability + * even though the physical connector is HDMI. Trust the connector type. + */ + edid_caps->edid_hdmi = connector->display_info.is_hdmi || + (connector->edid_overridden && + (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)); if (edid_caps->edid_hdmi) populate_hdmi_info_from_connector(&connector->display_info.hdmi, edid_caps); -- 2.53.0