| 12345678910111213141516171819202122232425262728293031323334 |
- From 9d59b54f5b608a823f01982a1aabac76a364556d Mon Sep 17 00:00:00 2001
- From: Maxime Ripard <[email protected]>
- Date: Wed, 13 Jan 2021 11:07:48 +0100
- Subject: [PATCH] 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: Thomas Zimmermann <[email protected]>
- Signed-off-by: Maxime Ripard <[email protected]>
- ---
- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
- --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
- +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
- @@ -792,6 +792,8 @@ static void vc5_hdmi_csc_setup(struct vc
-
- 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.
- @@ -907,7 +909,6 @@ static void vc5_hdmi_set_timings(struct
-
- 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) |
|
