summaryrefslogtreecommitdiff
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-06-04 14:37:07 +0200
commit9ac75dc3b48844437e1d2d4338bfa3fa59da13e9 (patch)
tree4426c23c39f95cf3e00c07df411f3f861d89df6b
parent7a5dac0e9171727dcfb2c6a857c2c66a24bd2e3d (diff)
downloadlinux-9ac75dc3b48844437e1d2d4338bfa3fa59da13e9.tar.gz
linux-9ac75dc3b48844437e1d2d4338bfa3fa59da13e9.tar.bz2
linux-9ac75dc3b48844437e1d2d4338bfa3fa59da13e9.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>
-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 39eb39e78d7a..c3b4a84a9f91 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5097,6 +5097,7 @@ 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->non_desktop = 0;
memset(&info->monitor_range, 0, sizeof(info->monitor_range));