Switch to the new drm_hotplug_helper() to handle bridge hotplugging.
Signed-off-by: Luca Ceresoli <[email protected]>
---
drivers/gpu/drm/mxsfb/Kconfig | 2 +-
drivers/gpu/drm/mxsfb/lcdif_drv.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/Kconfig b/drivers/gpu/drm/mxsfb/Kconfig
index 31db7a824a93..ada9a9334ea4 100644
--- a/drivers/gpu/drm/mxsfb/Kconfig
+++ b/drivers/gpu/drm/mxsfb/Kconfig
@@ -34,7 +34,7 @@ config DRM_IMX_LCDIF
select DRM_PANEL
select DRM_PANEL_BRIDGE
select DRM_DISPLAY_HELPER
- select DRM_BRIDGE_CONNECTOR
+ select DRM_HOTPLUG_HELPER
help
Choose this option if you have an LCDIFv3 LCD controller.
Those devices are found in various i.MX SoC (i.MX8MP,
diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c
b/drivers/gpu/drm/mxsfb/lcdif_drv.c
index e2173c4d6fc2..3d8904a48d9a 100644
--- a/drivers/gpu/drm/mxsfb/lcdif_drv.c
+++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c
@@ -18,7 +18,7 @@
#include <drm/clients/drm_client_setup.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
-#include <drm/drm_bridge_connector.h>
+#include <drm/drm_hotplug_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_encoder.h>
#include <drm/drm_fbdev_dma.h>
@@ -58,7 +58,7 @@ static int lcdif_attach_bridge(struct lcdif_drm_private
*lcdif)
struct of_endpoint of_ep;
struct drm_bridge *bridge;
struct drm_encoder *encoder;
- struct drm_connector *connector;
+ struct drm_hotplug_helper *hotplug_helper;
int ret;
if (!of_device_is_available(remote))
@@ -94,10 +94,10 @@ static int lcdif_attach_bridge(struct lcdif_drm_private
*lcdif)
"Failed to attach bridge for
endpoint%u\n",
of_ep.id);
- connector = drm_bridge_connector_init(lcdif->drm, encoder);
- if (IS_ERR(connector))
- return dev_err_probe(dev, PTR_ERR(connector),
- "Failed to init bridge_connector
for endpoint%u\n",
+ hotplug_helper = drmm_hotplug_helper_init(lcdif->drm, encoder);
+ if (IS_ERR(hotplug_helper))
+ return dev_err_probe(dev, PTR_ERR(hotplug_helper),
+ "Failed to init hotplug_helper for
endpoint%u\n",
of_ep.id);
}
--
2.55.0
