diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-01-20 16:16:16 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-01-25 10:02:41 +0100 |
| commit | 0cbb53b283d325fb90c3ab39c300c085bb7ac2f8 (patch) | |
| tree | 4497e47036eba3c05cdb1ec8f4396e3df36951ed /drivers/gpu/drm/vc4/vc4_hdmi.c | |
| parent | dccb4d74e06dd7ef758e8dd69a5420d0f3a9fb9f (diff) | |
| download | linux-0cbb53b283d325fb90c3ab39c300c085bb7ac2f8.tar.gz linux-0cbb53b283d325fb90c3ab39c300c085bb7ac2f8.tar.bz2 linux-0cbb53b283d325fb90c3ab39c300c085bb7ac2f8.zip | |
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 <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220120151625.594595-8-maxime@cerno.tech
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 47ff4507f017..0f8b1e907fae 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -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) | |