mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
drm/bridge: analogix_dp: don't create a panel_bridge
Now a panel_bridge is automatically created for every drm_panel and the panel-bridge API is just a deprecated wrapper to access it. Update and simplify the code by just getting a reference to the already-existing bridge using of_drm_get_bridge_by_endpoint(). As of_drm_get_bridge_by_endpoint() returns a refcounted bridge, take care of putting the bridge reference. This is not easily done in the remove path due to the different probe paths of the user drivers, so add a devm action to ensure the reference is put only when it was taken. Assisted-by: opencode:deepseek-v4-flash-0731 Tested-by: Damon Ding <damon.ding@rock-chips.com> Reviewed-by: Damon Ding <damon.ding@rock-chips.com> Link: https://patch.msgid.link/20260916-drm-bridge-every-panel-v3-19-83afb4f1a707@bootlin.com [Luca: remove now unused variable] Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
This commit is contained in:
Luca Ceresoli
parent
ebafe6afae
commit
90780f2c3d
|
|
@ -33,7 +33,6 @@ config DRM_ANALOGIX_DP
|
|||
depends on DRM
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_AUX_BUS
|
||||
select DRM_PANEL
|
||||
|
||||
config DRM_ANALOGIX_ANX7625
|
||||
tristate "Analogix Anx7625 MIPI to DP interface support"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <drm/drm_device.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
|
|
@ -1567,15 +1566,6 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev)
|
|||
if (ret)
|
||||
goto err_unregister_aux;
|
||||
|
||||
if (dp->plat_data->panel) {
|
||||
dp->plat_data->next_bridge = devm_drm_panel_bridge_add(dp->dev,
|
||||
dp->plat_data->panel);
|
||||
if (IS_ERR(dp->plat_data->next_bridge)) {
|
||||
ret = PTR_ERR(dp->plat_data->next_bridge);
|
||||
goto err_unregister_aux;
|
||||
}
|
||||
}
|
||||
|
||||
ret = drm_bridge_attach(dp->encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to create bridge (%d)\n", ret);
|
||||
|
|
@ -1647,6 +1637,11 @@ struct drm_dp_aux *analogix_dp_get_aux(struct analogix_dp_device *dp)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(analogix_dp_get_aux);
|
||||
|
||||
static void analogix_dp_put_bridge(void *data)
|
||||
{
|
||||
drm_bridge_put(data);
|
||||
}
|
||||
|
||||
static int analogix_dp_aux_done_probing(struct drm_dp_aux *aux)
|
||||
{
|
||||
struct analogix_dp_device *dp = to_dp(aux);
|
||||
|
|
@ -1655,14 +1650,25 @@ static int analogix_dp_aux_done_probing(struct drm_dp_aux *aux)
|
|||
int ret;
|
||||
|
||||
/*
|
||||
* If drm_of_find_panel_or_bridge() returns -ENODEV, there may be no valid panel
|
||||
* or bridge nodes. The driver should go on for the driver-free bridge or the DP
|
||||
* mode applications.
|
||||
* If of_drm_get_bridge_by_endpoint() returns -ENODEV, there may be no
|
||||
* valid panel or bridge nodes. The driver should go on for the
|
||||
* driver-free bridge or the DP mode applications.
|
||||
*/
|
||||
ret = drm_of_find_panel_or_bridge(dp->dev->of_node, port, 0,
|
||||
&plat_data->panel, &plat_data->next_bridge);
|
||||
if (ret && ret != -ENODEV)
|
||||
return ret;
|
||||
plat_data->next_bridge = of_drm_get_bridge_by_endpoint(dp->dev->of_node,
|
||||
port, 0);
|
||||
if (IS_ERR(plat_data->next_bridge)) {
|
||||
if (PTR_ERR(plat_data->next_bridge) == -ENODEV)
|
||||
plat_data->next_bridge = NULL;
|
||||
else
|
||||
return PTR_ERR(plat_data->next_bridge);
|
||||
}
|
||||
|
||||
if (plat_data->next_bridge) {
|
||||
ret = devm_add_action_or_reset(dp->dev, analogix_dp_put_bridge,
|
||||
plat_data->next_bridge);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return component_add(dp->dev, plat_data->ops);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_encoder.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/exynos_drm.h>
|
||||
|
|
@ -147,7 +146,6 @@ static const struct component_ops exynos_dp_ops = {
|
|||
static int exynos_dp_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct device_node *np;
|
||||
struct exynos_dp_device *dp;
|
||||
|
||||
dp = devm_kzalloc(&pdev->dev, sizeof(struct exynos_dp_device),
|
||||
|
|
@ -163,18 +161,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
|
|||
*/
|
||||
platform_set_drvdata(pdev, dp);
|
||||
|
||||
/* This is for the backward compatibility. */
|
||||
np = of_parse_phandle(dev->of_node, "panel", 0);
|
||||
if (np) {
|
||||
dp->plat_data.panel = of_drm_find_panel(np);
|
||||
|
||||
of_node_put(np);
|
||||
if (IS_ERR(dp->plat_data.panel))
|
||||
return PTR_ERR(dp->plat_data.panel);
|
||||
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (of_get_display_timings(dev->of_node)) {
|
||||
dp->plat_data.next_bridge = devm_drm_of_display_mode_bridge(dp->dev,
|
||||
dp->dev->of_node,
|
||||
|
|
@ -189,19 +175,11 @@ static int exynos_dp_probe(struct platform_device *pdev)
|
|||
dp->plat_data.power_off = exynos_dp_poweroff;
|
||||
dp->plat_data.ops = &exynos_dp_ops;
|
||||
|
||||
out:
|
||||
dp->adp = analogix_dp_probe(dev, &dp->plat_data);
|
||||
if (IS_ERR(dp->adp)) {
|
||||
/*
|
||||
* The driver core does not invoke remove() for failed probes,
|
||||
* so release the probe-time panel reference here.
|
||||
*/
|
||||
if (dp->plat_data.panel)
|
||||
drm_panel_put(dp->plat_data.panel);
|
||||
if (IS_ERR(dp->adp))
|
||||
return PTR_ERR(dp->adp);
|
||||
}
|
||||
|
||||
if (dp->plat_data.panel || dp->plat_data.next_bridge)
|
||||
if (dp->plat_data.next_bridge)
|
||||
return component_add(&pdev->dev, &exynos_dp_ops);
|
||||
else
|
||||
return analogix_dp_finish_probe(dp->adp);
|
||||
|
|
@ -209,16 +187,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
|
|||
|
||||
static void exynos_dp_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos_dp_device *dp = platform_get_drvdata(pdev);
|
||||
|
||||
/*
|
||||
* Release the probe-time reference from of_drm_find_panel(). If bind
|
||||
* ran, the panel_bridge holds a second reference that devm cleanup
|
||||
* will release when the bridge is destroyed after remove() returns.
|
||||
*/
|
||||
if (dp->plat_data.panel)
|
||||
drm_panel_put(dp->plat_data.panel);
|
||||
|
||||
component_del(&pdev->dev, &exynos_dp_ops);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include <drm/drm_bridge_connector.h>
|
||||
#include <drm/bridge/analogix_dp.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
|
|
@ -487,16 +486,6 @@ static int rockchip_dp_probe(struct platform_device *pdev)
|
|||
|
||||
static void rockchip_dp_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rockchip_dp_device *dp = platform_get_drvdata(pdev);
|
||||
|
||||
/*
|
||||
* Release the probe-time reference from of_drm_find_panel(). If bind
|
||||
* ran, the panel_bridge holds a second reference that devm cleanup
|
||||
* will release when the bridge is destroyed after remove() returns.
|
||||
*/
|
||||
if (dp->plat_data.panel)
|
||||
drm_panel_put(dp->plat_data.panel);
|
||||
|
||||
component_del(&pdev->dev, &rockchip_dp_component_ops);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ static inline bool analogix_dp_is_rockchip(enum analogix_dp_devtype type)
|
|||
|
||||
struct analogix_dp_plat_data {
|
||||
enum analogix_dp_devtype dev_type;
|
||||
struct drm_panel *panel;
|
||||
struct drm_bridge *next_bridge;
|
||||
struct drm_encoder *encoder;
|
||||
struct drm_connector *connector;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user