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

Commit 8d15e5fa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "drm/bridge: Introduce drm_bridge_get_next_bridge()" 



This reverts commit 9b2f5844.

It breaks the Android kernel api and was added only because of a tiny
drm driver bugfix for an issue that can not ever really be hit, so it is
safe to revert.

Bug: 161946584
Change-Id: If2efa0957f552df8b36a9a30cd2f03b0d59f5e88
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent aac98e0c

drivers/gpu/drm/drm_encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) 
		struct drm_bridge *next;



		while (bridge) {

			next = drm_bridge_get_next_bridge(bridge);

			next = bridge->next;

			drm_bridge_detach(bridge);

			bridge = next;

		}

drivers/gpu/drm/mediatek/mtk_hdmi.c

+2 −4
Original line number Diff line number Diff line
@@ -1237,18 +1237,16 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn, 
				    struct drm_display_mode *mode)

{

	struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);

	struct drm_bridge *next_bridge;



	dev_dbg(hdmi->dev, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n",

		mode->hdisplay, mode->vdisplay, mode->vrefresh,

		!!(mode->flags & DRM_MODE_FLAG_INTERLACE), mode->clock * 1000);



	next_bridge = drm_bridge_get_next_bridge(&hdmi->bridge);

	if (next_bridge) {

	if (hdmi->bridge.next) {

		struct drm_display_mode adjusted_mode;



		drm_mode_copy(&adjusted_mode, mode);

		if (!drm_bridge_chain_mode_fixup(next_bridge, mode,

		if (!drm_bridge_chain_mode_fixup(hdmi->bridge.next, mode,

						 &adjusted_mode))

			return MODE_BAD;

	}

drivers/gpu/drm/omapdrm/omap_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ static int omap_display_id(struct omap_dss_device *output) 
	} else if (output->bridge) {

		struct drm_bridge *bridge = output->bridge;



		while (drm_bridge_get_next_bridge(bridge))

			bridge = drm_bridge_get_next_bridge(bridge);

		while (bridge->next)

			bridge = bridge->next;



		node = bridge->of_node;

	} else if (output->panel) {

drivers/gpu/drm/omapdrm/omap_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, 
	for (dssdev = output; dssdev; dssdev = dssdev->next)

		omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags);



	for (bridge = output->bridge; bridge;

	     bridge = drm_bridge_get_next_bridge(bridge)) {

	for (bridge = output->bridge; bridge; bridge = bridge->next) {

		if (!bridge->timings)

			continue;

include/drm/drm_bridge.h

+0 −13
Original line number Diff line number Diff line
@@ -409,19 +409,6 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np); 
int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,

		      struct drm_bridge *previous);



/**

 * drm_bridge_get_next_bridge() - Get the next bridge in the chain

 * @bridge: bridge object

 *

 * RETURNS:

 * the next bridge in the chain after @bridge, or NULL if @bridge is the last.

 */

static inline struct drm_bridge *

drm_bridge_get_next_bridge(struct drm_bridge *bridge)

{

	return bridge->next;

}



bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,

				 const struct drm_display_mode *mode,

				 struct drm_display_mode *adjusted_mode);