summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorfeijuan.li <feijuan.li@samsung.com>2025-05-14 14:35:11 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-05-29 11:14:03 +0200
commitbf62459e025462c6107f99bbc428199388aef262 (patch)
tree764dbe511611bb5709a1d5e4f263443cfae83dd7 /drivers
parent0fa7a8d1977658a3ca01d052c573cbe0e0f76ca9 (diff)
downloadlinux-bf62459e025462c6107f99bbc428199388aef262.tar.gz
linux-bf62459e025462c6107f99bbc428199388aef262.tar.bz2
linux-bf62459e025462c6107f99bbc428199388aef262.zip
drm/edid: fixed the bug that hdr metadata was not reset
commit 6692dbc15e5ed40a3aa037aced65d7b8826c58cd upstream. When DP connected to a device with HDR capability, the hdr structure was filled.Then connected to another sink device without hdr capability, but the hdr info still exist. Fixes: e85959d6cbe0 ("drm: Parse HDR metadata info from EDID") Cc: <stable@vger.kernel.org> # v5.3+ Signed-off-by: "feijuan.li" <feijuan.li@samsung.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Link: https://lore.kernel.org/r/20250514063511.4151780-1-feijuan.li@samsung.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_edid.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 13bc4c290b17..9edb3247c767 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -6596,6 +6596,7 @@ static void drm_reset_display_info(struct drm_connector *connector)
info->has_hdmi_infoframe = false;
info->rgb_quant_range_selectable = false;
memset(&info->hdmi, 0, sizeof(info->hdmi));
+ memset(&connector->hdr_sink_metadata, 0, sizeof(connector->hdr_sink_metadata));
info->edid_hdmi_rgb444_dc_modes = 0;
info->edid_hdmi_ycbcr444_dc_modes = 0;