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: Boris Brezillon <boris.brezillon@free-electrons.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-10-git-send-email-boris.brezillon@free-electrons.com
This commit is contained in:
committed by
Daniel Vetter
parent
75e8c46174
commit
15b6412bad
@@ -26,18 +26,6 @@
|
|||||||
#include "rcar_du_lvdsenc.h"
|
#include "rcar_du_lvdsenc.h"
|
||||||
#include "rcar_du_vgacon.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
|
* Encoder
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -49,9 +49,6 @@ struct rcar_du_connector {
|
|||||||
#define to_rcar_connector(c) \
|
#define to_rcar_connector(c) \
|
||||||
container_of(c, struct rcar_du_connector, connector)
|
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,
|
int rcar_du_encoder_init(struct rcar_du_device *rcdu,
|
||||||
enum rcar_du_encoder_type type,
|
enum rcar_du_encoder_type type,
|
||||||
enum rcar_du_output output,
|
enum rcar_du_output output,
|
||||||
|
|||||||
@@ -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 = {
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
||||||
.get_modes = rcar_du_hdmi_connector_get_modes,
|
.get_modes = rcar_du_hdmi_connector_get_modes,
|
||||||
.mode_valid = rcar_du_hdmi_connector_mode_valid,
|
.mode_valid = rcar_du_hdmi_connector_mode_valid,
|
||||||
.best_encoder = rcar_du_connector_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static enum drm_connector_status
|
static enum drm_connector_status
|
||||||
|
|||||||
@@ -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 = {
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
||||||
.get_modes = rcar_du_lvds_connector_get_modes,
|
.get_modes = rcar_du_lvds_connector_get_modes,
|
||||||
.best_encoder = rcar_du_connector_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static enum drm_connector_status
|
static enum drm_connector_status
|
||||||
|
|||||||
@@ -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 = {
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
||||||
.get_modes = rcar_du_vga_connector_get_modes,
|
.get_modes = rcar_du_vga_connector_get_modes,
|
||||||
.best_encoder = rcar_du_connector_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static enum drm_connector_status
|
static enum drm_connector_status
|
||||||
@@ -79,7 +78,5 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
|
|||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
rcon->encoder = renc;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user