Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bb80f24 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: bridge: Link encoder and bridge in core code 



Instead of linking encoders and bridges in every driver (and getting it
wrong half of the time, as many drivers forget to set the drm_bridge
encoder pointer), do so in core code. The drm_bridge_attach() function
needs the encoder and optional previous bridge to perform that task,
update all the callers.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Stefan Agner <stefan@agner.ch> # For DCU
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> # For atmel-hlcdc
Acked-by: Vincent Abriou <vincent.abriou@st.com> # For STI
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> # For sun4i
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com> # For hisilicon
Acked-by: Jyri Sarha <jsarha@ti.com> # For tilcdc
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1481709550-29226-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com
parent 2407d1dc

drivers/gpu/drm/arc/arcpgu_hdmi.c

+1 −4
Original line number Diff line number Diff line
@@ -47,10 +47,7 @@ int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np) 
		return ret;



	/* Link drm_bridge to encoder */

	bridge->encoder = encoder;

	encoder->bridge = bridge;



	ret = drm_bridge_attach(drm, bridge);

	ret = drm_bridge_attach(encoder, bridge, NULL);

	if (ret)

		drm_encoder_cleanup(encoder);

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

+1 −3
Original line number Diff line number Diff line
@@ -230,9 +230,7 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, 
	of_node_put(np);



	if (bridge) {

		output->encoder.bridge = bridge;

		bridge->encoder = &output->encoder;

		ret = drm_bridge_attach(dev, bridge);

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

		if (!ret)

			return 0;

	}

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

+1 −3
Original line number Diff line number Diff line
@@ -1232,12 +1232,10 @@ static int analogix_dp_create_bridge(struct drm_device *drm_dev, 


	dp->bridge = bridge;



	dp->encoder->bridge = bridge;

	bridge->driver_private = dp;

	bridge->encoder = dp->encoder;

	bridge->funcs = &analogix_dp_bridge_funcs;



	ret = drm_bridge_attach(drm_dev, bridge);

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

	if (ret) {

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

		return -EINVAL;

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

+1 −2
Original line number Diff line number Diff line
@@ -1841,13 +1841,12 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) 
	hdmi->bridge = bridge;

	bridge->driver_private = hdmi;

	bridge->funcs = &dw_hdmi_bridge_funcs;

	ret = drm_bridge_attach(drm, bridge);

	ret = drm_bridge_attach(encoder, bridge, NULL);

	if (ret) {

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

		return -EINVAL;

	}



	encoder->bridge = bridge;

	hdmi->connector.polled = DRM_CONNECTOR_POLL_HPD;



	drm_connector_helper_add(&hdmi->connector,

drivers/gpu/drm/drm_bridge.c

+34 −12
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/mutex.h>



#include <drm/drm_bridge.h>

#include <drm/drm_encoder.h>



/**

 * DOC: overview
@@ -92,32 +93,53 @@ void drm_bridge_remove(struct drm_bridge *bridge) 
EXPORT_SYMBOL(drm_bridge_remove);



/**

 * drm_bridge_attach - associate given bridge to our DRM device

 * drm_bridge_attach - attach the bridge to an encoder's chain

 *

 * @dev: DRM device

 * @bridge: bridge control structure

 * @encoder: DRM encoder

 * @bridge: bridge to attach

 * @previous: previous bridge in the chain (optional)

 *

 * Called by a kms driver to link one of our encoder/bridge to the given

 * bridge.

 * Called by a kms driver to link the bridge to an encoder's chain. The previous

 * argument specifies the previous bridge in the chain. If NULL, the bridge is

 * linked directly at the encoder's output. Otherwise it is linked at the

 * previous bridge's output.

 *

 * Note that setting up links between the bridge and our encoder/bridge

 * objects needs to be handled by the kms driver itself.

 * If non-NULL the previous bridge must be already attached by a call to this

 * function.

 *

 * RETURNS:

 * Zero on success, error code on failure

 */

int drm_bridge_attach(struct drm_device *dev, struct drm_bridge *bridge)

int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,

		      struct drm_bridge *previous)

{

	if (!dev || !bridge)

	int ret;



	if (!encoder || !bridge)

		return -EINVAL;



	if (previous && (!previous->dev || previous->encoder != encoder))

		return -EINVAL;



	if (bridge->dev)

		return -EBUSY;



	bridge->dev = dev;

	bridge->dev = encoder->dev;

	bridge->encoder = encoder;



	if (bridge->funcs->attach) {

		ret = bridge->funcs->attach(bridge);

		if (ret < 0) {

			bridge->dev = NULL;

			bridge->encoder = NULL;

			return ret;

		}

	}



	if (bridge->funcs->attach)

		return bridge->funcs->attach(bridge);

	if (previous)

		previous->next = bridge;

	else

		encoder->bridge = bridge;



	return 0;

}