Unverified Commit 71860044 authored by Dave Stevenson's avatar Dave Stevenson Committed by Maxime Ripard
Browse files

drm/vc4: hdmi: Rename full range helper 



The VC4 HDMI driver has a helper function to figure out whether full
range or limited range RGB is being used called
vc4_hdmi_is_full_range_rgb().

We'll need it to support other colorspaces, so let's rename it to
vc4_hdmi_is_full_range().

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20221207-rpi-hdmi-improvements-v3-4-bdd54f66884e@cerno.tech


Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent d6020f4b

drivers/gpu/drm/vc4/vc4_hdmi.c

+5 −5
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode, 
	return clock > HDMI_14_MAX_TMDS_CLK;

}



static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,

static bool vc4_hdmi_is_full_range(struct vc4_hdmi *vc4_hdmi,

				   struct vc4_hdmi_connector_state *vc4_state)

{

	const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
@@ -916,7 +916,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) 


	drm_hdmi_avi_infoframe_quant_range(&frame.avi,

					   connector, mode,

					   vc4_hdmi_is_full_range_rgb(vc4_hdmi, vc4_state) ?

					   vc4_hdmi_is_full_range(vc4_hdmi, vc4_state) ?

					   HDMI_QUANTIZATION_RANGE_FULL :

					   HDMI_QUANTIZATION_RANGE_LIMITED);

	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
@@ -1174,7 +1174,7 @@ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, 
	csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR,

				VC4_HD_CSC_CTL_ORDER);



	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, vc4_state)) {

	if (!vc4_hdmi_is_full_range(vc4_hdmi, vc4_state)) {

		/* CEA VICs other than #1 requre limited range RGB

		 * output unless overridden by an AVI infoframe.

		 * Apply a colorspace conversion to squash 0-255 down
@@ -1327,7 +1327,7 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, 
	case VC4_HDMI_OUTPUT_RGB:

		if_xbar = 0x354021;



		if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, vc4_state))

		if (!vc4_hdmi_is_full_range(vc4_hdmi, vc4_state))

			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);

		else

			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);