drm: Remove unnecessary drm_panel_attach and drm_panel_detach

These functions are now empty and no longer
useful so remove the functions and their uses.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Bernard Zhao <bernard@vivo.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>,
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Icenowy Zheng <icenowy@aosc.io>,
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Robert Chiras <robert.chiras@nxp.com>
Cc: dri-devel@lists.freedesktop.org,
Cc: linux-kernel@vger.kernel.org
Cc: opensource.kernel@vivo.com
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> # Fixed build and a few warnings
Link: https://patchwork.freedesktop.org/patch/msgid/9e13761020750b1ce2f1fabee23ef6e2a2942882.camel@perches.com

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
index f082b4ed4878375fe0cee92c01995b7fcaa622d6..d9164fab044d03d05c4a6dca1bb39e092e0fbb1e 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -507,10 +507,6 @@ static const struct drm_connector_helper_funcs anx6345_connector_helper_funcs =
 static void
 anx6345_connector_destroy(struct drm_connector *connector)
 {
-       struct anx6345 *anx6345 = connector_to_anx6345(connector);
-
-       if (anx6345->panel)
-               drm_panel_detach(anx6345->panel);
        drm_connector_cleanup(connector);
 }
 
@@ -575,14 +571,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,
                return err;
        }
 
-       if (anx6345->panel) {
-               err = drm_panel_attach(anx6345->panel, &anx6345->connector);
-               if (err) {
-                       DRM_ERROR("Failed to attach panel: %d\n", err);
-                       return err;
-               }
-       }
-
        return 0;
 }
 

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 76736fb8ed949053fd96051d9f36160d31d27db6..aa1bb86293fdf49a19c8ae5271f39d50f136956a 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1265,14 +1265,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge,
                }
        }
 
-       if (dp->plat_data->panel) {
-               ret = drm_panel_attach(dp->plat_data->panel, &dp->connector);
-               if (ret) {
-                       DRM_ERROR("Failed to attach panel\n");
-                       return ret;
-               }
-       }
-
        return 0;
 }
 
@@ -1803,7 +1795,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)
        if (dp->plat_data->panel) {
                if (drm_panel_unprepare(dp->plat_data->panel))
                        DRM_ERROR("failed to turnoff the panel\n");
-               drm_panel_detach(dp->plat_data->panel);
        }
 
        drm_dp_aux_unregister(&dp->aux);

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 1e63ed6b18aa4f9b6013382696bb8b08f0ef5e9a..0ddc37551194e8db90861fc32941d1301b091cb5 100644 (file)
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -82,18 +82,11 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
        drm_connector_attach_encoder(&panel_bridge->connector,
                                          bridge->encoder);
 
-       ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);
-       if (ret < 0)
-               return ret;
-
        return 0;
 }
 
 static void panel_bridge_detach(struct drm_bridge *bridge)
 {
-       struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
-
-       drm_panel_detach(panel_bridge->panel);
 }
 
 static void panel_bridge_pre_enable(struct drm_bridge *bridge)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 86b9f0f87a14bbf8325d0169bbcb3b1283131c94..454544e0da7de335a8fde074ff4e8ada85dddf59 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -394,9 +394,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
        }
        pdata->dsi = dsi;
 
-       /* attach panel to bridge */
-       drm_panel_attach(pdata->panel, &pdata->connector);
-
        return 0;
 
 err_dsi_attach:

diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c
index b8e9abb537cfc0f62ed0b6a3c2c485e0eb8d108a..ba11c3641bf370a42299350d20254e00cca21325 100644 (file)
--- a/drivers/gpu/drm/drm_panel.c
+++ b/drivers/gpu/drm/drm_panel.c
@@ -93,42 +93,6 @@ void drm_panel_remove(struct drm_panel *panel)
 }
 EXPORT_SYMBOL(drm_panel_remove);
 
-/**
- * drm_panel_attach - attach a panel to a connector
- * @panel: DRM panel
- * @connector: DRM connector
- *
- * After obtaining a pointer to a DRM panel a display driver calls this
- * function to attach a panel to a connector.
- *
- * An error is returned if the panel is already attached to another connector.
- *
- * When unloading, the driver should detach from the panel by calling
- * drm_panel_detach().
- *
- * Return: 0 on success or a negative error code on failure.
- */
-int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector)
-{
-       return 0;
-}
-EXPORT_SYMBOL(drm_panel_attach);
-
-/**
- * drm_panel_detach - detach a panel from a connector
- * @panel: DRM panel
- *
- * Detaches a panel from the connector it is attached to. If a panel is not
- * attached to any connector this is effectively a no-op.
- *
- * This function should not be called by the panel device itself. It
- * is only for the drm device that called drm_panel_attach().
- */
-void drm_panel_detach(struct drm_panel *panel)
-{
-}
-EXPORT_SYMBOL(drm_panel_detach);
-
 /**
  * drm_panel_prepare - power on a panel
  * @panel: DRM panel

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 7ba5354e7d9446f97d094eb8112cb33d7f1fe197..741323a2e6c3c3a55d10ab7f6d5d61536c7c2dcd 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -42,11 +42,6 @@ static inline struct exynos_dpi *encoder_to_dpi(struct drm_encoder *e)
 static enum drm_connector_status
 exynos_dpi_detect(struct drm_connector *connector, bool force)
 {
-       struct exynos_dpi *ctx = connector_to_dpi(connector);
-
-       if (ctx->panel)
-               drm_panel_attach(ctx->panel, &ctx->connector);
-
        return connector_status_connected;
 }
 
@@ -249,8 +244,5 @@ int exynos_dpi_remove(struct drm_encoder *encoder)
 
        exynos_dpi_disable(&ctx->encoder);
 
-       if (ctx->panel)
-               drm_panel_detach(ctx->panel);
-
        return 0;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index ee96a95fb6be50824d3483530d5e4ae14135d1df..db0eab53dcfeaa16885b8435d2068f2a11aaabd6 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1551,12 +1551,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
                }
 
                dsi->panel = of_drm_find_panel(device->dev.of_node);
-               if (IS_ERR(dsi->panel)) {
+               if (IS_ERR(dsi->panel))
                        dsi->panel = NULL;
-               } else {
-                       drm_panel_attach(dsi->panel, &dsi->connector);
+               else
                        dsi->connector.status = connector_status_connected;
-               }
        }
 
        /*
@@ -1596,7 +1594,6 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,
        if (dsi->panel) {
                mutex_lock(&drm->mode_config.mutex);
                exynos_dsi_disable(&dsi->encoder);
-               drm_panel_detach(dsi->panel);
                dsi->panel = NULL;
                dsi->connector.status = connector_status_disconnected;
                mutex_unlock(&drm->mode_config.mutex);

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index 9b0c4736c21ae565a59a0e8cf98cf3e7d759cee6..4d4a715b429d1d4461b7a79debe829c940385655 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -40,10 +40,7 @@ int fsl_dcu_drm_encoder_create(struct fsl_dcu_drm_device *fsl_dev,
 
 static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)
 {
-       struct fsl_dcu_drm_connector *fsl_con = to_fsl_dcu_connector(connector);
-
        drm_connector_unregister(connector);
-       drm_panel_detach(fsl_con->panel);
        drm_connector_cleanup(connector);
 }
 
@@ -101,12 +98,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
        if (ret < 0)
                goto err_sysfs;
 
-       ret = drm_panel_attach(panel, connector);
-       if (ret) {
-               dev_err(fsl_dev->dev, "failed to attach panel\n");
-               goto err_sysfs;
-       }
-
        return 0;
 
 err_sysfs:

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 66ea68e8da8757d23c33f345280e6c6c60f6beee..35a6bad7dcf8b35f8fae320621d542f33c199c63 100644 (file)
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -463,13 +463,6 @@ static int imx_ldb_register(struct drm_device *drm,
                drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
        }
 
-       if (imx_ldb_ch->panel) {
-               ret = drm_panel_attach(imx_ldb_ch->panel,
-                                      &imx_ldb_ch->connector);
-               if (ret)
-                       return ret;
-       }
-
        return 0;
 }
 
@@ -718,9 +711,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,
        for (i = 0; i < 2; i++) {
                struct imx_ldb_channel *channel = &imx_ldb->channel[i];
 
-               if (channel->panel)
-                       drm_panel_detach(channel->panel);
-
                kfree(channel->edid);
                i2c_put_adapter(channel->ddc);
        }

diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index ac916c84a63185ef584569ab5bba2c599d96c95d..cba2abbb420d755d402bca70b3241ca384a8928f 100644 (file)
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -298,9 +298,6 @@ static int imx_pd_register(struct drm_device *drm,
                                   DRM_MODE_CONNECTOR_DPI);
        }
 
-       if (imxpd->panel)
-               drm_panel_attach(imxpd->panel, &imxpd->connector);
-
        if (imxpd->next_bridge) {
                ret = drm_bridge_attach(encoder, imxpd->next_bridge,
                                        &imxpd->bridge, 0);
@@ -369,9 +366,6 @@ static void imx_pd_unbind(struct device *dev, struct device *master,
 {
        struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
 
-       if (imxpd->panel)
-               drm_panel_detach(imxpd->panel);
-
        kfree(imxpd->edid);
 }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 270bf22c98feb06248672d0d89de28d2a7419c48..e4e56e53aeeacdec7cd418d1bd97d326cd5e061b 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -861,19 +861,7 @@ static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi)
        dsi->conn.dpms = DRM_MODE_DPMS_OFF;
        drm_connector_attach_encoder(&dsi->conn, &dsi->encoder);
 
-       if (dsi->panel) {
-               ret = drm_panel_attach(dsi->panel, &dsi->conn);
-               if (ret) {
-                       DRM_ERROR("Failed to attach panel to drm\n");
-                       goto err_connector_cleanup;
-               }
-       }
-
        return 0;
-
-err_connector_cleanup:
-       drm_connector_cleanup(&dsi->conn);
-       return ret;
 }
 
 static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi)
@@ -921,8 +909,6 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)
        /* Skip connector cleanup if creation was delegated to the bridge */
        if (dsi->conn.dev)
                drm_connector_cleanup(&dsi->conn);
-       if (dsi->panel)
-               drm_panel_detach(dsi->panel);
 }
 
 static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp)

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
index c7df71e2fafca2df22773b77e020295d92ee6f4c..7288041dd86ad806e0843939c5c1036ff338d955 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
@@ -50,14 +50,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)
        struct drm_panel *panel = mdp4_lvds_connector->panel;
        int ret = 0;
 
-       if (panel) {
-               drm_panel_attach(panel, connector);
-
+       if (panel)
                ret = drm_panel_get_modes(panel, connector);
 
-               drm_panel_detach(panel);
-       }
-
        return ret;
 }
 

diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index 4b363bd7ddfffd096dfded5b128f3fb6c28a0304..1d28dfba2c9bb5d67fdadb2f8c82411df7c47ac4 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -328,7 +328,6 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)
         * In dual DSI mode, we have one connector that can be
         * attached to the drm_panel.
         */
-       drm_panel_attach(panel, connector);
        num = drm_panel_get_modes(panel, connector);
        if (!num)
                return 0;

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 4526967978b7adddfe26b585bdb658cfd4c33555..53d5e184ee77cae0a8a57d4c20302be80e9805d0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -349,13 +349,6 @@ static int omap_modeset_init(struct drm_device *dev)
 
                drm_connector_attach_encoder(pipe->connector, encoder);
 
-               if (pipe->output->panel) {
-                       ret = drm_panel_attach(pipe->output->panel,
-                                              pipe->connector);
-                       if (ret < 0)
-                               return ret;
-               }
-
                crtc = omap_crtc_init(dev, pipe, priv->planes[i]);
                if (IS_ERR(crtc))
                        return PTR_ERR(crtc);
@@ -394,18 +387,8 @@ static int omap_modeset_init(struct drm_device *dev)
 
 static void omap_modeset_fini(struct drm_device *ddev)
 {
-       struct omap_drm_private *priv = ddev->dev_private;
-       unsigned int i;
-
        omap_drm_irq_uninstall(ddev);
 
-       for (i = 0; i < priv->num_pipes; i++) {
-               struct omap_drm_pipeline *pipe = &priv->pipes[i];
-
-               if (pipe->output->panel)
-                       drm_panel_detach(pipe->output->panel);
-       }
-
        drm_mode_config_cleanup(ddev);
 }
 

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index ab0d49618cf9015b0232fc43c7494bdd63060662..bced729a96fe87bcdb2c9e81d912d2134170c110 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -677,15 +677,11 @@ static int rcar_lvds_attach(struct drm_bridge *bridge,
        if (ret < 0)
                return ret;
 
-       return drm_panel_attach(lvds->panel, connector);
+       return 0;
 }
 
 static void rcar_lvds_detach(struct drm_bridge *bridge)
 {
-       struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
-
-       if (lvds->panel)
-               drm_panel_detach(lvds->panel);
 }
 
 static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {

diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 63f967902c2d847922199cdae79cf517dd4d74da..f292c6a6e20fb9b1ba1937693dbef958b27df958 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -634,13 +634,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
                                      "failed to attach encoder: %d\n", ret);
                        goto err_free_connector;
                }
-
-               ret = drm_panel_attach(lvds->panel, connector);
-               if (ret < 0) {
-                       DRM_DEV_ERROR(drm_dev->dev,
-                                     "failed to attach panel: %d\n", ret);
-                       goto err_free_connector;
-               }
        } else {
                ret = drm_bridge_attach(encoder, lvds->bridge, NULL, 0);
                if (ret) {
@@ -676,8 +669,6 @@ static void rockchip_lvds_unbind(struct device *dev, struct device *master,
 
        encoder_funcs = lvds->soc_data->helper_funcs;
        encoder_funcs->disable(&lvds->encoder);
-       if (lvds->panel)
-               drm_panel_detach(lvds->panel);
        pm_runtime_disable(dev);
        drm_connector_cleanup(&lvds->connector);
        drm_encoder_cleanup(&lvds->encoder);

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index de4af7735c469c8620acd803866c2d4cc7451fe2..ddb4184f07264c76b5b5e3e8d1db7232242691b1 100644 (file)
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -389,8 +389,6 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force)
                dvo->panel = of_drm_find_panel(dvo->panel_node);
                if (IS_ERR(dvo->panel))
                        dvo->panel = NULL;
-               else
-                       drm_panel_attach(dvo->panel, connector);
        }
 
        if (dvo->panel)

diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
index ffda3184aa12ab2dccfec07214695207f57b2380..d06dd313d3c012d800f9cdfd122e63009c9e396b 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
+++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
@@ -54,9 +54,6 @@ static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = {
 static void
 sun4i_lvds_connector_destroy(struct drm_connector *connector)
 {
-       struct sun4i_lvds *lvds = drm_connector_to_sun4i_lvds(connector);
-
-       drm_panel_detach(lvds->panel);
        drm_connector_cleanup(connector);
 }
 
@@ -141,12 +138,6 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
 
                drm_connector_attach_encoder(&lvds->connector,
                                                  &lvds->encoder);
-
-               ret = drm_panel_attach(lvds->panel, &lvds->connector);
-               if (ret) {
-                       dev_err(drm->dev, "Couldn't attach our panel\n");
-                       goto err_cleanup_connector;
-               }
        }
 
        if (bridge) {

diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index 5a7d43939ae67819742ceec29e189084749f3a3a..23df1ec034162ab9d930df79191e1a028545be77 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -145,9 +145,6 @@ static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = {
 static void
 sun4i_rgb_connector_destroy(struct drm_connector *connector)
 {
-       struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector);
-
-       drm_panel_detach(rgb->panel);
        drm_connector_cleanup(connector);
 }
 
@@ -233,12 +230,6 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
 
                drm_connector_attach_encoder(&rgb->connector,
                                                  &rgb->encoder);
-
-               ret = drm_panel_attach(rgb->panel, &rgb->connector);
-               if (ret) {
-                       dev_err(drm->dev, "Couldn't attach our panel\n");
-                       goto err_cleanup_connector;
-               }
        }
 
        if (rgb->bridge) {

diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index aa67cb037e9d10a417e932ea9abc7fca68fdb30f..a78aebfe773db8d724045debfaba066acea384c2 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -973,7 +973,6 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host,
        dsi->panel = panel;
        dsi->device = device;
 
-       drm_panel_attach(dsi->panel, &dsi->connector);
        drm_kms_helper_hotplug_event(dsi->drm);
 
        dev_info(host->dev, "Attached device %s\n", device->name);
@@ -985,12 +984,10 @@ static int sun6i_dsi_detach(struct mipi_dsi_host *host,
                            struct mipi_dsi_device *device)
 {
        struct sun6i_dsi *dsi = host_to_sun6i_dsi(host);
-       struct drm_panel *panel = dsi->panel;
 
        dsi->panel = NULL;
        dsi->device = NULL;
 
-       drm_panel_detach(panel);
        drm_kms_helper_hotplug_event(dsi->drm);
 
        return 0;

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 38beab9ab4f8c0921f2c3840b38a4528bbdf27ce..37b89c396d3b69f12d589ed6aeef052a9b75ad0d 100644 (file)
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -1493,10 +1493,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host,
                if (IS_ERR(output->panel))
                        output->panel = NULL;
 
-               if (output->panel && output->connector.dev) {
-                       drm_panel_attach(output->panel, &output->connector);
+               if (output->panel && output->connector.dev)
                        drm_helper_hpd_irq_event(output->connector.dev);
-               }
        }
 
        return 0;

diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index e36e5e7c2f694dfe627b1c720d959509041735ce..a3adb9e4debf563acecf2b778ff5c3860aa0532d 100644 (file)
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -179,13 +179,6 @@ void tegra_output_remove(struct tegra_output *output)
 int tegra_output_init(struct drm_device *drm, struct tegra_output *output)
 {
        int connector_type;
-       int err;
-
-       if (output->panel) {
-               err = drm_panel_attach(output->panel, &output->connector);
-               if (err < 0)
-                       return err;
-       }
 
        /*
         * The connector is now registered and ready to receive hotplug events
@@ -220,9 +213,6 @@ void tegra_output_exit(struct tegra_output *output)
         */
        if (output->hpd_gpio)
                disable_irq(output->hpd_irq);
-
-       if (output->panel)
-               drm_panel_detach(output->panel);
 }
 
 void tegra_output_find_possible_crtcs(struct tegra_output *output,

diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index ff066524cb70791b105569e7a1ca9a1e80e3e98f..45a1b5a2275db133b4cdf4ef641748155a9c6c27 100644 (file)
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -178,9 +178,6 @@ void drm_panel_init(struct drm_panel *panel, struct device *dev,
 void drm_panel_add(struct drm_panel *panel);
 void drm_panel_remove(struct drm_panel *panel);
 
-int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector);
-void drm_panel_detach(struct drm_panel *panel);
-
 int drm_panel_prepare(struct drm_panel *panel);
 int drm_panel_unprepare(struct drm_panel *panel);