drm/vc4: txp: Add support for BCM2712 MOP

The BCM2712 has an evolution of what used to be called TXP in the
earlier SoCs, but is now called MOP.

There's a few differences still, so we can add a new compatible to deal
with them easily.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index 8f85ea2..3befb20 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -384,6 +384,7 @@ static const struct drm_connector_funcs vc4_txp_connector_funcs = {
 static void vc4_txp_encoder_disable(struct drm_encoder *encoder)
 {
        struct drm_device *drm = encoder->dev;
+       struct vc4_dev *vc4 = to_vc4_dev(drm);
        struct vc4_txp *txp = encoder_to_vc4_txp(encoder);
        int idx;
 
@@ -402,7 +403,8 @@ static void vc4_txp_encoder_disable(struct drm_encoder *encoder)
                WARN_ON(TXP_READ(TXP_DST_CTRL) & TXP_BUSY);
        }
 
-       TXP_WRITE(TXP_DST_CTRL, TXP_POWERDOWN);
+       if (vc4->gen < VC4_GEN_6)
+               TXP_WRITE(TXP_DST_CTRL, TXP_POWERDOWN);
 
        drm_dev_exit(idx);
 }
@@ -506,6 +508,19 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+const struct vc4_txp_data bcm2712_mop_data = {
+       .base = {
+               .name = "mop",
+               .debugfs_name = "mop_regs",
+               .hvs_available_channels = BIT(2),
+               .hvs_output = 2,
+       },
+       .encoder_type = VC4_ENCODER_TYPE_TXP0,
+       .has_byte_enable = true,
+       .size_minus_one = true,
+       .supports_40bit_addresses = true,
+};
+
 const struct vc4_txp_data bcm2835_txp_data = {
        .base = {
                .name = "txp",
@@ -611,6 +626,7 @@ static void vc4_txp_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id vc4_txp_dt_match[] = {
+       { .compatible = "brcm,bcm2712-mop", .data = &bcm2712_mop_data },
        { .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
        { /* sentinel */ },
 };