drm/ingenic: Support multiple panels/bridges

Support multiple panels or bridges connected to the same DPI output of
the SoC. This setup can be found for instance on the GCW Zero, where the
same DPI output interfaces the internal 320x240 TFT panel, and the ITE
IT6610 HDMI chip.

v2: No change

v3: Allow > 80-char lines where it makes sense

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716163846.174790-11-paul@crapouillou.net

diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index bc2a7e9bab07374d2ab7fcda87a00d2f7417c284..c755bdd5563b4c2ff2c91aad9e4ad922d466b86c 100644 (file)
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -57,7 +57,6 @@ struct ingenic_drm {
         */
        struct drm_plane f0, f1, *ipu_plane;
        struct drm_crtc crtc;
-       struct drm_encoder encoder;
 
        struct device *dev;
        struct regmap *map;
@@ -112,12 +111,6 @@ static inline struct ingenic_drm *drm_crtc_get_priv(struct drm_crtc *crtc)
        return container_of(crtc, struct ingenic_drm, crtc);
 }
 
-static inline struct ingenic_drm *
-drm_encoder_get_priv(struct drm_encoder *encoder)
-{
-       return container_of(encoder, struct ingenic_drm, encoder);
-}
-
 static void ingenic_drm_crtc_atomic_enable(struct drm_crtc *crtc,
                                           struct drm_crtc_state *state)
 {
@@ -468,7 +461,7 @@ static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder,
                                                struct drm_crtc_state *crtc_state,
                                                struct drm_connector_state *conn_state)
 {
-       struct ingenic_drm *priv = drm_encoder_get_priv(encoder);
+       struct ingenic_drm *priv = drm_device_get_priv(encoder->dev);
        struct drm_display_mode *mode = &crtc_state->adjusted_mode;
        struct drm_connector *conn = conn_state->connector;
        struct drm_display_info *info = &conn->display_info;
@@ -688,9 +681,11 @@ static int ingenic_drm_bind(struct device *dev)
        struct clk *parent_clk;
        struct drm_bridge *bridge;
        struct drm_panel *panel;
+       struct drm_encoder *encoder;
        struct drm_device *drm;
        void __iomem *base;
        long parent_rate;
+       unsigned int i, clone_mask = 0;
        int ret, irq;
 
        soc_info = of_device_get_match_data(dev);
@@ -752,17 +747,6 @@ static int ingenic_drm_bind(struct device *dev)
                return PTR_ERR(priv->pix_clk);
        }
 
-       ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get panel handle\n");
-               return ret;
-       }
-
-       if (panel)
-               bridge = devm_drm_panel_bridge_add_typed(dev, panel,
-                                                        DRM_MODE_CONNECTOR_DPI);
-
        priv->dma_hwdesc_f1 = dmam_alloc_coherent(dev, sizeof(*priv->dma_hwdesc_f1),
                                                  &priv->dma_hwdesc_phys_f1,
                                                  GFP_KERNEL);
@@ -844,22 +828,47 @@ static int ingenic_drm_bind(struct device *dev)
                }
        }
 
-       priv->encoder.possible_crtcs = 1;
+       for (i = 0; ; i++) {
+               ret = drm_of_find_panel_or_bridge(dev->of_node, 0, i, &panel, &bridge);
+               if (ret) {
+                       if (ret == -ENODEV)
+                               break; /* we're done */
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(dev, "Failed to get bridge handle\n");
+                       return ret;
+               }
 
-       drm_encoder_helper_add(&priv->encoder,
-                              &ingenic_drm_encoder_helper_funcs);
+               if (panel)
+                       bridge = devm_drm_panel_bridge_add_typed(dev, panel,
+                                                                DRM_MODE_CONNECTOR_DPI);
 
-       ret = drm_simple_encoder_init(drm, &priv->encoder,
-                                     DRM_MODE_ENCODER_DPI);
-       if (ret) {
-               dev_err(dev, "Failed to init encoder: %i\n", ret);
-               return ret;
+               encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL);
+               if (!encoder)
+                       return -ENOMEM;
+
+               encoder->possible_crtcs = 1;
+
+               drm_encoder_helper_add(encoder, &ingenic_drm_encoder_helper_funcs);
+
+               ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DPI);
+               if (ret) {
+                       dev_err(dev, "Failed to init encoder: %d\n", ret);
+                       return ret;
+               }
+
+               ret = drm_bridge_attach(encoder, bridge, NULL, 0);
+               if (ret) {
+                       dev_err(dev, "Unable to attach bridge\n");
+                       return ret;
+               }
        }
 
-       ret = drm_bridge_attach(&priv->encoder, bridge, NULL, 0);
-       if (ret) {
-               dev_err(dev, "Unable to attach bridge\n");
-               return ret;
+       drm_for_each_encoder(encoder, drm) {
+               clone_mask |= BIT(drm_encoder_index(encoder));
+       }
+
+       drm_for_each_encoder(encoder, drm) {
+               encoder->possible_clones = clone_mask;
        }
 
        ret = drm_irq_install(drm, irq);