5.4-stable patches

added patches:
	drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch

diff --git a/queue-5.4/drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch b/queue-5.4/drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch
new file mode 100644 (file)
index 0000000..4a07080
--- /dev/null
+++ b/queue-5.4/drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch
@@ -0,0 +1,35 @@
+From 6692dbc15e5ed40a3aa037aced65d7b8826c58cd Mon Sep 17 00:00:00 2001
+From: "feijuan.li" <feijuan.li@samsung.com>
+Date: Wed, 14 May 2025 14:35:11 +0800
+Subject: drm/edid: fixed the bug that hdr metadata was not reset
+
+From: feijuan.li <feijuan.li@samsung.com>
+
+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>
+---
+ drivers/gpu/drm/drm_edid.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -4629,6 +4629,7 @@ drm_reset_display_info(struct drm_connec
+       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;
+ }

diff --git a/queue-5.4/series b/queue-5.4/series
index 8ef7b1911f22d7260866b39e0a5262ac851e86f3..353246a15709a728c300e7a83d8239f66e118e8c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -177,3 +177,4 @@ can-bcm-add-locking-for-bcm_op-runtime-updates.patch
 can-bcm-add-missing-rcu-read-protection-for-procfs-content.patch
 alsa-pcm-fix-race-of-buffer-access-at-pcm-oss-layer.patch
 llc-fix-data-loss-when-reading-from-a-socket-in-llc_ui_recvmsg.patch
+drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch