drm/edid: Clear EDID Deep Color Modes in drm_reset_display_info()
Subsystems (2)
PATCH 1/1 drm/edid: Clear EDID Deep Color Modes in drm_reset_display_info()
Even though we have the other drm_display_info fields reset, the DC modes are missing.
This shouldn't be an issue since it's explicitely reset every time a new EDID is parsed.
--- drivers/gpu/drm/drm_edid.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_edid.c +3 -0
@@ -5340,6 +5340,9 @@ drm_reset_display_info(struct drm_connector *connector) info->rgb_quant_range_selectable = false;memset (&info->hdmi,0 ,sizeof (info->hdmi)); + info->edid_hdmi_rgb444_dc_modes =0 ; + info->edid_hdmi_ycbcr444_dc_modes =0 ; + info->non_desktop =0 ;memset (&info->monitor_range,0 ,sizeof (info->monitor_range));
Signature · 1 line
2.34.1
Quoted 5 lines · Maxime Ripard
Even though we have the other
drm_display_infofields reset, the DC modes are missing.This shouldn't be an issue since it's explicitely reset every time a new EDID is parsed.
It's not really obvious that it can't be an issue. I think we might be saved by info->bpc getting reset to 8 by drm_parse_hdmi_vsdb_video(). But the dc_modes bitfields themselves may be left with stale values.
Hmm, actually drm_add_display_info() re-populates info->bpc *after* drm_parse_hdmi_vsdb_video() so we could in theory end up with bpc>8 and dc_modes!=0 even if the display doesn't support any HDMI deep color modes. Though I suppose a display that doesn't do deep color but declares its max bpc as >8 is a bit nuts. I could maybe imagine it happening if the display supports >8 bpc with DP but not with HDMI, and doesn't bother customizing the EDID sufficiently for each interface.
Quoted 3 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
drivers/gpu/drm/drm_edid.c drm_reset_display_info(struct drm_connector *connector) · line 5341
Quoted 11 lines
--- drivers/gpu/drm/drm_edid.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/drm_edid.c +0
-0@@ -5340,6 +5340,9 @@ drm_reset_display_info(struct drm_connector *connector) info->rgb_quant_range_selectable = false;memset (&info->hdmi,0 ,sizeof (info->hdmi));
We should probably just move more stuff into that .hdmi struct...
Quoted 9 lines
drivers/gpu/drm/drm_edid.c +3
-0+ info->edid_hdmi_rgb444_dc_modes =0 ; + info->edid_hdmi_ycbcr444_dc_modes =0 ; + info->non_desktop =0 ;memset (&info->monitor_range,0 ,sizeof (info->monitor_range));Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
Quoted 5 lines · Maxime Ripard
Even though we have the other
drm_display_infofields reset, the DC modes are missing.This shouldn't be an issue since it's explicitely reset every time a new EDID is parsed.
Side note, and hijacking the thread a bit: I think it's a historical mistake we've started accumulating stuff in struct drm_display_info that is *not* derived from the EDID or DisplayID. I think drm_reset_display_info() should just be one memset() and that's it. Adding stuff that should not be reset here feels wrong.
Maybe we should just move all the non-EDID derived members directly to struct drm_connector? Or some other sub-struct.
In the mean time, this patch seems like the right thing to do,
BR,
Jani.
Quoted 20 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>--- drivers/gpu/drm/drm_edid.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/drm_edid.c +3
-0@@ -5340,6 +5340,9 @@ drm_reset_display_info(struct drm_connector *connector) info->rgb_quant_range_selectable = false;memset (&info->hdmi,0 ,sizeof (info->hdmi)); + info->edid_hdmi_rgb444_dc_modes =0 ; + info->edid_hdmi_ycbcr444_dc_modes =0 ; + info->non_desktop =0 ;memset (&info->monitor_range,0 ,sizeof (info->monitor_range));
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Maxime Ripard
AppliedRe: (subset) [PATCH] drm/edid: Clear EDID Deep Color Modes in drm_reset_display_info()
In reply to Maxime RipardQuoted 8 lines · Maxime Ripard
Even though we have the other
drm_display_infofields reset, the DC modes are missing.This shouldn't be an issue since it's explicitely reset every time a new EDID is parsed.
[...]
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime