Unverified Commit c03d0b52 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/connector: Fix typo in output format 



The HDMI specification mentions YCbCr everywhere, but our enums have
YCrCb. Let's rename it to match.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220120151625.594595-5-maxime@cerno.tech
parent 4adc33f3

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -5816,7 +5816,7 @@ static void fill_stream_properties_from_drm_display_mode( 
	else if (drm_mode_is_420_also(info, mode_in)

			&& aconnector->force_yuv420_output)

		timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;

	else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB444)

	else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444)

			&& stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)

		timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR444;

	else

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

+6 −6
Original line number Diff line number Diff line
@@ -1078,11 +1078,11 @@ static void d71_improc_update(struct komeda_component *c, 
	mask |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420;



	/* config color format */

	if (st->color_format == DRM_COLOR_FORMAT_YCRCB420)

	if (st->color_format == DRM_COLOR_FORMAT_YCBCR420)

		ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420;

	else if (st->color_format == DRM_COLOR_FORMAT_YCRCB422)

	else if (st->color_format == DRM_COLOR_FORMAT_YCBCR422)

		ctrl |= IPS_CTRL_YUV | IPS_CTRL_CHD422;

	else if (st->color_format == DRM_COLOR_FORMAT_YCRCB444)

	else if (st->color_format == DRM_COLOR_FORMAT_YCBCR444)

		ctrl |= IPS_CTRL_YUV;



	malidp_write32_mask(reg, BLK_CONTROL, mask, ctrl);
@@ -1144,11 +1144,11 @@ static int d71_improc_init(struct d71_dev *d71, 
	improc = to_improc(c);

	improc->supported_color_depths = BIT(8) | BIT(10);

	improc->supported_color_formats = DRM_COLOR_FORMAT_RGB444 |

					  DRM_COLOR_FORMAT_YCRCB444 |

					  DRM_COLOR_FORMAT_YCRCB422;

					  DRM_COLOR_FORMAT_YCBCR444 |

					  DRM_COLOR_FORMAT_YCBCR422;

	value = malidp_read32(reg, BLK_INFO);

	if (value & IPS_INFO_CHD420)

		improc->supported_color_formats |= DRM_COLOR_FORMAT_YCRCB420;

		improc->supported_color_formats |= DRM_COLOR_FORMAT_YCBCR420;



	improc->supports_csc = true;

	improc->supports_gamma = true;

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void adv7511_set_config_csc(struct adv7511 *adv7511, 
		config.csc_coefficents = adv7511_csc_ycbcr_to_rgb;



		if ((connector->display_info.color_formats &

		     DRM_COLOR_FORMAT_YCRCB422) &&

		     DRM_COLOR_FORMAT_YCBCR422) &&

		    config.hdmi_mode) {

			config.csc_enable = false;

			config.avi_infoframe.colorspace =

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1537,9 +1537,9 @@ static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, 
		video->color_depth = COLOR_8;

		break;

	}

	if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)

	if (display_info->color_formats & DRM_COLOR_FORMAT_YCBCR444)

		video->color_space = COLOR_YCBCR444;

	else if (display_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)

	else if (display_info->color_formats & DRM_COLOR_FORMAT_YCBCR422)

		video->color_space = COLOR_YCBCR422;

	else

		video->color_space = COLOR_RGB;

drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c

+9 −9
Original line number Diff line number Diff line
@@ -1553,13 +1553,13 @@ static u32 cdns_mhdp_get_bpp(struct cdns_mhdp_display_fmt *fmt) 


	switch (fmt->color_format) {

	case DRM_COLOR_FORMAT_RGB444:

	case DRM_COLOR_FORMAT_YCRCB444:

	case DRM_COLOR_FORMAT_YCBCR444:

		bpp = fmt->bpc * 3;

		break;

	case DRM_COLOR_FORMAT_YCRCB422:

	case DRM_COLOR_FORMAT_YCBCR422:

		bpp = fmt->bpc * 2;

		break;

	case DRM_COLOR_FORMAT_YCRCB420:

	case DRM_COLOR_FORMAT_YCBCR420:

		bpp = fmt->bpc * 3 / 2;

		break;

	default:
@@ -1767,8 +1767,8 @@ static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp, 
	 * If YCBCR supported and stream not SD, use ITU709

	 * Need to handle ITU version with YCBCR420 when supported

	 */

	if ((pxlfmt == DRM_COLOR_FORMAT_YCRCB444 ||

	     pxlfmt == DRM_COLOR_FORMAT_YCRCB422) && mode->crtc_vdisplay >= 720)

	if ((pxlfmt == DRM_COLOR_FORMAT_YCBCR444 ||

	     pxlfmt == DRM_COLOR_FORMAT_YCBCR422) && mode->crtc_vdisplay >= 720)

		misc0 = DP_YCBCR_COEFFICIENTS_ITU709;



	bpp = cdns_mhdp_get_bpp(&mhdp->display_fmt);
@@ -1778,15 +1778,15 @@ static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp, 
		pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;

		misc0 |= DP_COLOR_FORMAT_RGB;

		break;

	case DRM_COLOR_FORMAT_YCRCB444:

	case DRM_COLOR_FORMAT_YCBCR444:

		pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;

		misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;

		break;

	case DRM_COLOR_FORMAT_YCRCB422:

	case DRM_COLOR_FORMAT_YCBCR422:

		pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;

		misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;

		break;

	case DRM_COLOR_FORMAT_YCRCB420:

	case DRM_COLOR_FORMAT_YCBCR420:

		pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;

		break;

	default:
@@ -1882,7 +1882,7 @@ static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp, 
	if (mhdp->display_fmt.y_only)

		misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;

	/* Use VSC SDP for Y420 */

	if (pxlfmt == DRM_COLOR_FORMAT_YCRCB420)

	if (pxlfmt == DRM_COLOR_FORMAT_YCBCR420)

		misc1 = CDNS_DP_TEST_VSC_SDP;



	cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),