[PATCH 02/14] drm/edid: Convert to drm_output_color_format enum

Maxime Ripard
2026-02-24T10:58:58Z

Now that we introduced a new drm_output_color_format enum to represent
what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new
enum.

The main different is that while DRM_COLOR_FORMAT_ was a bitmask,
drm_output_color_format is a proper enum. However, the enum was done is
such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so
the transitition is easier.

The only thing we need to consider is if the original code meant to use
that value as a bitmask, in which case we do need to keep the bit shift,
or as a discriminant in which case we don't.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_edid.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 26bb7710a46204548c150a25d390dac512ec7f0e..316bbdcdbbd3a9bb447e1a4127be9da039e306b5 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5314,11 +5314,11 @@ static void parse_cta_y420cmdb(struct drm_connector *connector,
for (i = 0; i < map_len; i++)
map |= (u64)data[i] << (8 * i);

out:
if (map)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);

*y420cmdb_map = map;
}

static int add_cea_modes(struct drm_connector *connector,
@@ -6090,11 +6090,11 @@ static void parse_cta_y420vdb(struct drm_connector *connector,

if (!drm_valid_cea_vic(vic))
continue;

bitmap_set(hdmi->y420_vdb_modes, vic, 1);
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
}
}

static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
{
@@ -6424,15 +6424,15 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
"[CONNECTOR:%d:%s] CEA extension version mismatch %u != %u\n",
connector->base.id, connector->name,
info->cea_rev, edid_ext[1]);

/* The existence of a CTA extension should imply RGB support */
- info->color_formats = DRM_COLOR_FORMAT_RGB444;
+ info->color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
if (edid_ext[3] & EDID_CEA_YCRCB444)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444);
if (edid_ext[3] & EDID_CEA_YCRCB422)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);
if (edid_ext[3] & EDID_BASIC_AUDIO)
info->has_audio = true;

}
drm_edid_iter_end(&edid_iter);
@@ -6696,11 +6696,11 @@ static void update_display_info(struct drm_connector *connector,
goto out;

if (!drm_edid_is_digital(drm_edid))
goto out;

- info->color_formats |= DRM_COLOR_FORMAT_RGB444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
drm_parse_cea_ext(connector, drm_edid);

update_displayid_info(connector, drm_edid);

/*
@@ -6750,13 +6750,13 @@ static void update_display_info(struct drm_connector *connector,
drm_dbg_kms(connector->dev,
"[CONNECTOR:%d:%s] Assigning EDID-1.4 digital sink color depth as %d bpc.\n",
connector->base.id, connector->name, info->bpc);

if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444);
if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)
- info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
+ info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422);

drm_update_mso(connector, drm_edid);

out:
if (drm_edid_has_internal_quirk(connector, EDID_QUIRK_NON_DESKTOP)) {
@@ -7227,11 +7227,11 @@ static bool is_hdmi2_sink(const struct drm_connector *connector)
*/
if (!connector)
return true;

return connector->display_info.hdmi.scdc.supported ||
- connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR420;
+ connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
}

static u8 drm_mode_hdmi_vic(const struct drm_connector *connector,
const struct drm_display_mode *mode)
{

--
2.52.0