drm/arm: komeda: Convert to drm_output_color_format

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.

Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20260305-drm-rework-color-formats-v3-10-f3935f6db579@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

Maxime Ripard 2 months ago 7889c1a5 4bf05805

+12 -11

4 changed files

expand all

drivers

gpu

drm

arm

display

komeda

d71

d71_component.c

komeda_crtc.c

komeda_pipeline.h

komeda_pipeline_state.c

+7 -7

drivers/gpu/drm/arm/display/komeda/d71/d71_component.c

··· 1080 1080 mask |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420; 1081 1081 1082 1082 /* config color format */ 1083 - if (st->color_format == DRM_COLOR_FORMAT_YCBCR420) 1083 + if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR420) 1084 1084 ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420; 1085 - else if (st->color_format == DRM_COLOR_FORMAT_YCBCR422) 1085 + else if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR422) 1086 1086 ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422; 1087 - else if (st->color_format == DRM_COLOR_FORMAT_YCBCR444) 1087 + else if (st->color_format == DRM_OUTPUT_COLOR_FORMAT_YCBCR444) 1088 1088 ctrl |= IPS_CTRL_YUV; 1089 1089 1090 1090 malidp_write32_mask(reg, BLK_CONTROL, mask, ctrl); ··· 1145 1145 1146 1146 improc = to_improc(c); 1147 1147 improc->supported_color_depths = BIT(8) | BIT(10); 1148 - improc->supported_color_formats = DRM_COLOR_FORMAT_RGB444 | 1149 - DRM_COLOR_FORMAT_YCBCR444 | 1150 - DRM_COLOR_FORMAT_YCBCR422; 1148 + improc->supported_color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | 1149 + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | 1150 + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422); 1151 1151 value = malidp_read32(reg, BLK_INFO); 1152 1152 if (value & IPS_INFO_CHD420) 1153 - improc->supported_color_formats |= DRM_COLOR_FORMAT_YCBCR420; 1153 + improc->supported_color_formats |= BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); 1154 1154 1155 1155 improc->supports_csc = true; 1156 1156 improc->supports_gamma = true;

+1 -1

drivers/gpu/drm/arm/display/komeda/komeda_crtc.c

··· 40 40 41 41 /* connector doesn't config any color_format, use RGB444 as default */ 42 42 if (!conn_color_formats) 43 - conn_color_formats = DRM_COLOR_FORMAT_RGB444; 43 + conn_color_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444); 44 44 45 45 *color_depths = GENMASK(min_bpc, 0); 46 46 *color_formats = conn_color_formats;

+3 -2

drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h

··· 319 319 320 320 struct komeda_improc { 321 321 struct komeda_component base; 322 - u32 supported_color_formats; /* DRM_RGB/YUV444/YUV420*/ 322 + u32 supported_color_formats; /* BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444/YUV444/YUV420) */ 323 323 u32 supported_color_depths; /* BIT(8) | BIT(10)*/ 324 324 u8 supports_degamma : 1; 325 325 u8 supports_csc : 1; ··· 328 328 329 329 struct komeda_improc_state { 330 330 struct komeda_component_state base; 331 - u8 color_format, color_depth; 331 + enum drm_output_color_format color_format; 332 + u8 color_depth; 332 333 u16 hsize, vsize; 333 334 u32 fgamma_coeffs[KOMEDA_N_GAMMA_COEFFS]; 334 335 u32 ctm_coeffs[KOMEDA_N_CTM_COEFFS];

+1 -1

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

··· 799 799 } 800 800 801 801 st->color_depth = __fls(avail_depths); 802 - st->color_format = BIT(__ffs(avail_formats)); 802 + st->color_format = __ffs(avail_formats); 803 803 } 804 804 805 805 if (kcrtc_st->base.color_mgmt_changed) {

Configure Feed

Configure Feed