Skip to content

Commit ecbd491

Browse files
committed
drm/edid: Always set RGB444
In order to fill the drm_display_info structure each time an EDID is read, the code currently will call drm_add_display_info with the parsed EDID. drm_add_display_info will then call drm_reset_display_info to reset all the fields to 0, and then set them to the proper value depending on the EDID. In the color_formats case, we will thus report that we don't support any color format, and then fill it back with RGB444 plus the additional formats described in the EDID Feature Support byte. However, since that byte only contains format-related bits since the 1.4 specification, this doesn't happen if the EDID is following an earlier specification. In turn, it means that for one of these EDID, we end up with color_formats set to 0. The EDID 1.3 specification never really specifies what it means by RGB exactly, but since both HDMI and DVI will use RGB444, it's fairly safe to assume it's supposed to be RGB444. Let's move the addition of RGB444 to color_formats earlier in drm_add_display_info() so that it's always set for a digital display. Fixes: da05a5a ("drm: parse color format support for digital displays") Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reported-by: Matthias Reichl <hias@horus.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220203115416.1137308-1-maxime@cerno.tech
1 parent f762ce7 commit ecbd491

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/drm_edid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5345,6 +5345,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi
53455345
if (!(edid->input & DRM_EDID_INPUT_DIGITAL))
53465346
return quirks;
53475347

5348+
info->color_formats |= DRM_COLOR_FORMAT_RGB444;
53485349
drm_parse_cea_ext(connector, edid);
53495350

53505351
/*
@@ -5393,7 +5394,6 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi
53935394
DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n",
53945395
connector->name, info->bpc);
53955396

5396-
info->color_formats |= DRM_COLOR_FORMAT_RGB444;
53975397
if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)
53985398
info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;
53995399
if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)

0 commit comments

Comments
 (0)