On 12/8/25 12:11 PM, Mikhail Gavrilov wrote:
On Mon, Dec 8, 2025 at 9:42 PM Pillai, Aurabindo
<[email protected]> wrote:
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Mikhail,
Turns out we had a followup fix for this issue: "drm/amd/display: Improve HDMI info
retrieval". Do you have this in your tree?
Hi Aurabindo,
No, I do not have this commit in my tree. I am currently testing on
the mainline Linux repository (Torvalds' tree), and it seems this fix
hasn't landed there yet.
I just updated to the latest master (commit c2f2b01b74be) and searched
for it, but found nothing:
mikhail@primary-ws ~/p/g/linux (master)> git remote -v
origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (fetch)
origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (push)
mikhail@primary-ws ~/p/g/linux (master)> git log --all --grep="Improve
HDMI info retrieval" -i --oneline
mikhail@primary-ws ~/p/g/linux (master)>
Could you please point me to the tree/branch where this fix is
located, or send it as a patch? I would be happy to apply it and test
if it resolves the regression.
It is available on amd-staging-drm-next. I'm also attaching here. Let me
know if this helps.From 9b99115c274382585e776039dddab1aa9cf13ae6 Mon Sep 17 00:00:00 2001
From: Ivan Lipski <[email protected]>
Date: Fri, 7 Nov 2025 16:50:37 -0500
Subject: [PATCH] drm/amd/display: Improve HDMI info retrieval
[WHY & HOW]
Make a dedicated function to read HDMI-related monitor info, including
monitor's SCDC support.
Suggested-by: Fangzhi Zuo <[email protected]>
Reviewed-by: Jerry Zuo <[email protected]>
Signed-off-by: Ivan Lipski <[email protected]>
Signed-off-by: Alex Hung <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +++
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index ef97cede9926..bd0403005f37 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -1063,6 +1063,9 @@ int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
void amdgpu_dm_update_connector_after_detect(
struct amdgpu_dm_connector *aconnector);
+void populate_hdmi_info_from_connector(struct drm_hdmi_info *info,
+ struct dc_edid_caps *edid_caps);
+
extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;
int amdgpu_dm_process_dmub_aux_transfer_sync(struct dc_context *ctx, unsigned int link_index,
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 ac98c746c3de..e5e993d3ef74 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
@@ -139,6 +139,9 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
edid_caps->edid_hdmi = connector->display_info.is_hdmi;
+ if (edid_caps->edid_hdmi)
+ populate_hdmi_info_from_connector(&connector->display_info.hdmi, edid_caps);
+
apply_edid_quirks(dev, edid_buf, edid_caps);
sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);
@@ -990,6 +993,11 @@ dm_helpers_read_acpi_edid(struct amdgpu_dm_connector *aconnector)
return drm_edid_read_custom(connector, dm_helpers_probe_acpi_edid, connector);
}
+void populate_hdmi_info_from_connector(struct drm_hdmi_info *hdmi, struct dc_edid_caps *edid_caps)
+{
+ edid_caps->scdc_present = hdmi->scdc.supported;
+}
+
enum dc_edid_status dm_helpers_read_local_edid(
struct dc_context *ctx,
struct dc_link *link,
--
2.52.0
