Commit 15b6412b authored by Boris Brezillon's avatar Boris Brezillon Committed by Daniel Vetter
Browse files

drm: rcar-du: Rely on the default ->best_encoder() behavior 



All outputs have a 1:1 relationship between connectors and encoders,
and the driver is relying on the atomic helpers: we can drop the custom
->best_encoder() implementations and let the core call
drm_atomic_helper_best_encoder() for us.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-10-git-send-email-boris.brezillon@free-electrons.com
parent 75e8c461

drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+0 −12
Original line number Diff line number Diff line
@@ -26,18 +26,6 @@ 
#include "rcar_du_lvdsenc.h"

#include "rcar_du_vgacon.h"



/* -----------------------------------------------------------------------------

 * Common connector functions

 */



struct drm_encoder *

rcar_du_connector_best_encoder(struct drm_connector *connector)

{

	struct rcar_du_connector *rcon = to_rcar_connector(connector);



	return rcar_encoder_to_drm_encoder(rcon->encoder);

}



/* -----------------------------------------------------------------------------

 * Encoder

 */

drivers/gpu/drm/rcar-du/rcar_du_encoder.h

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ struct rcar_du_connector { 
#define to_rcar_connector(c) \

	container_of(c, struct rcar_du_connector, connector)



struct drm_encoder *

rcar_du_connector_best_encoder(struct drm_connector *connector);



int rcar_du_encoder_init(struct rcar_du_device *rcdu,

			 enum rcar_du_encoder_type type,

			 enum rcar_du_output output,

drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static int rcar_du_hdmi_connector_mode_valid(struct drm_connector *connector, 
static const struct drm_connector_helper_funcs connector_helper_funcs = {

	.get_modes = rcar_du_hdmi_connector_get_modes,

	.mode_valid = rcar_du_hdmi_connector_mode_valid,

	.best_encoder = rcar_du_connector_best_encoder,

};



static enum drm_connector_status

drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector) 


static const struct drm_connector_helper_funcs connector_helper_funcs = {

	.get_modes = rcar_du_lvds_connector_get_modes,

	.best_encoder = rcar_du_connector_best_encoder,

};



static enum drm_connector_status

drivers/gpu/drm/rcar-du/rcar_du_vgacon.c

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ static int rcar_du_vga_connector_get_modes(struct drm_connector *connector) 


static const struct drm_connector_helper_funcs connector_helper_funcs = {

	.get_modes = rcar_du_vga_connector_get_modes,

	.best_encoder = rcar_du_connector_best_encoder,

};



static enum drm_connector_status
@@ -79,7 +78,5 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu, 
	if (ret < 0)

		return ret;



	rcon->encoder = renc;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE