diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-05-24 00:37:45 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-05-24 00:37:53 +0300 |
| commit | 79061ca8bfcf59504971c9cf77e3bcd875d82e99 (patch) | |
| tree | b5f7839d62d2d50abb5d76cc6a991826340b3d7f | |
| parent | a5806cd506af5a7c19bcd596e4708b5c464bfd21 (diff) | |
| parent | 6692dbc15e5ed40a3aa037aced65d7b8826c58cd (diff) | |
| download | linux-79061ca8bfcf59504971c9cf77e3bcd875d82e99.tar.xz | |
Merge tag 'drm-misc-fixes-2025-05-22' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Short summary of fixes pull:
edid:
- fix HDR metadata reset
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250522113902.GA7000@localhost.localdomain
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 1 |
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; |