drm/vc4: Separate VEC compatible variants

The VEC's DAC on BCM2711 is slightly different compared to the one on
BCM283x and needs different configuration. In particular, bit 3
(mask 0x8) switches the BCM2711 DAC input to "self-test input data",
which makes the output unusable. Separating two compatible variants in
devicetrees and the DRM driver was therefore necessary.

The configurations used for both variants have been borrowed from
Raspberry Pi (model 3B for BCM283x, 4B for BCM2711) firmware defaults.

Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210520150344.273900-4-maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 090529d0d5dcda1995eb67a50ceba7f798abcc7a..11fc3d6f66b1ec5c9c3ff2873f3a21a1cb1cbe68 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -154,9 +154,14 @@
 #define VEC_DAC_MISC_DAC_RST_N         BIT(0)
 
 
+struct vc4_vec_variant {
+       u32 dac_config;
+};
+
 /* General VEC hardware state. */
 struct vc4_vec {
        struct platform_device *pdev;
+       const struct vc4_vec_variant *variant;
 
        struct drm_encoder *encoder;
        struct drm_connector *connector;
@@ -445,10 +450,7 @@ static void vc4_vec_encoder_enable(struct drm_encoder *encoder)
        VEC_WRITE(VEC_CONFIG2,
                  VEC_CONFIG2_UV_DIG_DIS | VEC_CONFIG2_RGB_DIG_DIS);
        VEC_WRITE(VEC_CONFIG3, VEC_CONFIG3_HORIZ_LEN_STD);
-       VEC_WRITE(VEC_DAC_CONFIG,
-                 VEC_DAC_CONFIG_DAC_CTRL(0xc) |
-                 VEC_DAC_CONFIG_DRIVER_CTRL(0xc) |
-                 VEC_DAC_CONFIG_LDO_BIAS_CTRL(0x46));
+       VEC_WRITE(VEC_DAC_CONFIG, vec->variant->dac_config);
 
        /* Mask all interrupts. */
        VEC_WRITE(VEC_MASK0, 0);
@@ -501,8 +503,21 @@ static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = {
        .atomic_mode_set = vc4_vec_encoder_atomic_mode_set,
 };
 
+static const struct vc4_vec_variant bcm2835_vec_variant = {
+       .dac_config = VEC_DAC_CONFIG_DAC_CTRL(0xc) |
+                     VEC_DAC_CONFIG_DRIVER_CTRL(0xc) |
+                     VEC_DAC_CONFIG_LDO_BIAS_CTRL(0x46)
+};
+
+static const struct vc4_vec_variant bcm2711_vec_variant = {
+       .dac_config = VEC_DAC_CONFIG_DAC_CTRL(0x0) |
+                     VEC_DAC_CONFIG_DRIVER_CTRL(0x80) |
+                     VEC_DAC_CONFIG_LDO_BIAS_CTRL(0x61)
+};
+
 static const struct of_device_id vc4_vec_dt_match[] = {
-       { .compatible = "brcm,bcm2835-vec", .data = NULL },
+       { .compatible = "brcm,bcm2835-vec", .data = &bcm2835_vec_variant },
+       { .compatible = "brcm,bcm2711-vec", .data = &bcm2711_vec_variant },
        { /* sentinel */ },
 };
 
@@ -540,6 +555,8 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
        vec->encoder = &vc4_vec_encoder->base.base;
 
        vec->pdev = pdev;
+       vec->variant = (const struct vc4_vec_variant *)
+               of_device_get_match_data(dev);
        vec->regs = vc4_ioremap_regs(pdev, 0);
        if (IS_ERR(vec->regs))
                return PTR_ERR(vec->regs);