Commit fb8d617f authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm/bridge: Centralize error message when bridge attach fails 



Being informed of a failure to attach a bridge is useful, and many
drivers prints an error message in that case. Move the message to
drm_bridge_attach() to avoid code duplication.

Suggested-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarJyri Sarha <jyri.sarha@iki.fi>
parent 5e7ef0b8

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+1 −8
Original line number Diff line number Diff line
@@ -1583,7 +1583,6 @@ static int analogix_dp_create_bridge(struct drm_device *drm_dev, 
				     struct analogix_dp_device *dp)

{

	struct drm_bridge *bridge;

	int ret;



	bridge = devm_kzalloc(drm_dev->dev, sizeof(*bridge), GFP_KERNEL);

	if (!bridge) {
@@ -1596,13 +1595,7 @@ static int analogix_dp_create_bridge(struct drm_device *drm_dev, 
	bridge->driver_private = dp;

	bridge->funcs = &analogix_dp_bridge_funcs;



	ret = drm_bridge_attach(dp->encoder, bridge, NULL, 0);

	if (ret) {

		DRM_ERROR("failed to attach drm bridge\n");

		return -EINVAL;

	}



	return 0;

	return drm_bridge_attach(dp->encoder, bridge, NULL, 0);

}



static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp)

drivers/gpu/drm/bridge/analogix/anx7625.c

+1 −4
Original line number Diff line number Diff line
@@ -1359,12 +1359,9 @@ static int anx7625_bridge_attach(struct drm_bridge *bridge, 
		err = drm_bridge_attach(bridge->encoder,

					ctx->pdata.panel_bridge,

					&ctx->bridge, flags);

		if (err) {

			DRM_DEV_ERROR(dev,

				      "Fail to attach panel bridge: %d\n", err);

		if (err)

			return err;

	}

	}



	ctx->bridge_attached = 1;

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+0 −1
Original line number Diff line number Diff line
@@ -3474,7 +3474,6 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, 
	ret = drm_bridge_attach(encoder, &hdmi->bridge, NULL, 0);

	if (ret) {

		dw_hdmi_remove(hdmi);

		DRM_ERROR("Failed to initialize bridge with drm\n");

		return ERR_PTR(ret);

	}

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c

+1 −9
Original line number Diff line number Diff line
@@ -1229,15 +1229,7 @@ EXPORT_SYMBOL_GPL(dw_mipi_dsi_remove); 
 */

int dw_mipi_dsi_bind(struct dw_mipi_dsi *dsi, struct drm_encoder *encoder)

{

	int ret;



	ret = drm_bridge_attach(encoder, &dsi->bridge, NULL, 0);

	if (ret) {

		DRM_ERROR("Failed to initialize bridge with drm\n");

		return ret;

	}



	return ret;

	return drm_bridge_attach(encoder, &dsi->bridge, NULL, 0);

}

EXPORT_SYMBOL_GPL(dw_mipi_dsi_bind);

drivers/gpu/drm/drm_bridge.c

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <drm/drm_atomic_state_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_encoder.h>

#include <drm/drm_print.h>



#include "drm_crtc_internal.h"
@@ -225,6 +226,15 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, 
	bridge->dev = NULL;

	bridge->encoder = NULL;

	list_del(&bridge->chain_node);



#ifdef CONFIG_OF

	DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n",

		  bridge->of_node, encoder->name, ret);

#else

	DRM_ERROR("failed to attach bridge to encoder %s: %d\n",

		  encoder->name, ret);

#endif



	return ret;

}

EXPORT_SYMBOL(drm_bridge_attach);