This is a partial revert of 87154ff86bf6 ("drm: Remove unnecessary drm_panel_attach and drm_panel_detach").
In order to make the probe order expectation more consistent between bridges, let's create attach and detach hooks for the panels as well to match what is there for bridges.
Most drivers have changed significantly since the reverted commit, so we only brought back the calls in the panel bridge to lessen the risk of regressions, and since panel bridge is what we're converging to these days, it's not a big deal anyway.
Signed-off-by: Maxime Ripard maxime@cerno.tech --- drivers/gpu/drm/bridge/panel.c | 6 +++++ drivers/gpu/drm/drm_panel.c | 47 ++++++++++++++++++++++++++++++++++ include/drm/drm_panel.h | 27 +++++++++++++++++++ 3 files changed, 80 insertions(+)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index c916f4b8907e..0b06e0dbad00 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -82,6 +82,10 @@ 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; }
@@ -90,6 +94,8 @@ static void panel_bridge_detach(struct drm_bridge *bridge) struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); struct drm_connector *connector = &panel_bridge->connector;
+ drm_panel_detach(panel_bridge->panel); + /* * Cleanup the connector if we know it was initialized. * diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index f634371c717a..10716b740685 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -93,6 +93,53 @@ 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) +{ + if (!panel) + return -EINVAL; + + if (panel->funcs && panel->funcs->attach) + return panel->funcs->attach(panel); + + 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) +{ + if (!panel) + return; + + if (panel->funcs && panel->funcs->detach) + panel->funcs->detach(panel); +} +EXPORT_SYMBOL(drm_panel_detach); + /** * drm_panel_prepare - power on a panel * @panel: DRM panel diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 4602f833eb51..33d139e98b19 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -68,6 +68,30 @@ enum drm_panel_orientation; * does not need to implement the functionality to enable/disable backlight. */ struct drm_panel_funcs { + /** + * @attach: + * + * This callback is invoked whenever our panel is being attached + * to its DRM connector. + * + * The @attach callback is optional. + * + * RETURNS: + * + * Zero on success, error code on failure. + */ + int (*attach)(struct drm_panel *panel); + + /** + * @detach: + * + * This callback is invoked whenever our panel is being detached + * from its DRM connector. + * + * The @detach callback is optional. + */ + void (*detach)(struct drm_panel *panel); + /** * @prepare: * @@ -180,6 +204,9 @@ 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);