github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/edid: Convert to drm_output_color_format enum

Browse Source 
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 difference 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.

Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260305-drm-rework-color-formats-v3-2-f3935f6db579@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
Maxime Ripard 2026-03-05 10:04:54 +01:00
parent f3934e12f2
commit a563653d19
No known key found for this signature in database
GPG Key ID: 275FCE19A23DBE76
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/drm_edid.c
View File

@ -5316,7 +5316,7 @@ static void parse_cta_y420cmdb(struct drm_connector *connector,
out:
if (map)
info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
info->color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
*y420cmdb_map = map;
}
@ -6092,7 +6092,7 @@ static void parse_cta_y420vdb(struct drm_connector *connector,
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);
}
}
@ -6426,11 +6426,11 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
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;
@ -6698,7 +6698,7 @@ static void update_display_info(struct drm_connector *connector,
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);
@ -6752,9 +6752,9 @@ static void update_display_info(struct drm_connector *connector,
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);
@ -7229,7 +7229,7 @@ static bool is_hdmi2_sink(const struct drm_connector *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,