From d9c03210a3d861c9ce5f346a760b19024a5eeaee Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 7 Apr 2026 09:52:19 +0000 Subject: [PATCH] drm/amd/display: Fix drm_edid leak in amdgpu_dm From Alex Hung eb95595194e4755b62360aa821f40a79b0953105 in linux-6.18.y/6.18.21 37c2caa167b0b8aca4f74c32404c5288b876a2a3 in mainline linux --- sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e91d6fdac17..3b0a5b0938c 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3830,8 +3830,9 @@ void amdgpu_dm_update_connector_after_detect( aconnector->dc_sink = sink; dc_sink_retain(aconnector->dc_sink); + drm_edid_free(aconnector->drm_edid); + aconnector->drm_edid = NULL; if (sink->dc_edid.length == 0) { - aconnector->drm_edid = NULL; hdmi_cec_unset_edid(aconnector); if (aconnector->dc_link->aux_mode) { drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux);