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

Commit 4a878c03 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: bridge: Detach bridge from encoder at encoder cleanup time 



Most drivers that use bridges forgot to detach them at cleanup time.
Instead of fixing them one by one, detach the bridge in the core
drm_encoder_cleanup() function.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
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-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com
parent 3bb80f24

drivers/gpu/drm/drm_bridge.c

+2 −11
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <drm/drm_bridge.h>

#include <drm/drm_encoder.h>



#include "drm_crtc_internal.h"



/**

 * DOC: overview

 *
@@ -145,16 +147,6 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, 
}

EXPORT_SYMBOL(drm_bridge_attach);



/**

 * drm_bridge_detach - deassociate given bridge from its DRM device

 *

 * @bridge: bridge control structure

 *

 * Called by a kms driver to unlink the given bridge from its DRM device.

 *

 * Note that tearing down links between the bridge and our encoder/bridge

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

 */

void drm_bridge_detach(struct drm_bridge *bridge)

{

	if (WARN_ON(!bridge))
@@ -168,7 +160,6 @@ void drm_bridge_detach(struct drm_bridge *bridge) 


	bridge->dev = NULL;

}

EXPORT_SYMBOL(drm_bridge_detach);



/**

 * DOC: bridge callbacks

drivers/gpu/drm/drm_crtc_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -186,6 +186,9 @@ void drm_plane_unregister_all(struct drm_device *dev); 
int drm_plane_check_pixel_format(const struct drm_plane *plane,

				 u32 format);



/* drm_bridge.c */

void drm_bridge_detach(struct drm_bridge *bridge);



/* IOCTL */

int drm_mode_getplane_res(struct drm_device *dev, void *data,

			  struct drm_file *file_priv);

drivers/gpu/drm/drm_encoder.c

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) 
	 * the indices on the drm_encoder after us in the encoder_list.

	 */



	if (encoder->bridge)

		drm_bridge_detach(encoder->bridge);



	drm_mode_object_unregister(dev, &encoder->base);

	kfree(encoder->name);

	list_del(&encoder->head);

drivers/gpu/drm/drm_simple_kms_helper.c

+0 −17
Original line number Diff line number Diff line
@@ -186,23 +186,6 @@ int drm_simple_display_pipe_attach_bridge(struct drm_simple_display_pipe *pipe, 
}

EXPORT_SYMBOL(drm_simple_display_pipe_attach_bridge);



/**

 * drm_simple_display_pipe_detach_bridge - Detach the bridge from the display pipe

 * @pipe: simple display pipe object

 *

 * Detaches the drm bridge previously attached with

 * drm_simple_display_pipe_attach_bridge()

 */

void drm_simple_display_pipe_detach_bridge(struct drm_simple_display_pipe *pipe)

{

	if (WARN_ON(!pipe->encoder.bridge))

		return;



	drm_bridge_detach(pipe->encoder.bridge);

	pipe->encoder.bridge = NULL;

}

EXPORT_SYMBOL(drm_simple_display_pipe_detach_bridge);



/**

 * drm_simple_display_pipe_init - Initialize a simple display pipeline

 * @dev: DRM device

drivers/gpu/drm/imx/imx-ldb.c

+0 −2
Original line number Diff line number Diff line
@@ -736,8 +736,6 @@ static void imx_ldb_unbind(struct device *dev, struct device *master, 
	for (i = 0; i < 2; i++) {

		struct imx_ldb_channel *channel = &imx_ldb->channel[i];



		if (channel->bridge)

			drm_bridge_detach(channel->bridge);

		if (channel->panel)

			drm_panel_detach(channel->panel);