Unverified Commit 0cbb53b2 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Move XBAR setup to csc_setup 



On the BCM2711, the HDMI_VEC_INTERFACE_XBAR register configuration
depends on whether we're using an RGB or YUV output. Let's move that
configuration to the CSC setup.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220120151625.594595-8-maxime@cerno.tech
parent dccb4d74

drivers/gpu/drm/vc4/vc4_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, 


	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);



	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);



	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {

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

		 * output unless overridden by an AVI infoframe.
@@ -899,7 +901,6 @@ static void vc5_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi, 


	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);



	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);

	HDMI_WRITE(HDMI_HORZA,

		   (vsync_pos ? VC5_HDMI_HORZA_VPOS : 0) |

		   (hsync_pos ? VC5_HDMI_HORZA_HPOS : 0) |