Commit b2d61d66 authored by Boris Brezillon's avatar Boris Brezillon Committed by Daniel Vetter

drm: vc4: 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>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-15-git-send-email-boris.brezillon@free-electrons.com
parent 26b4ee34
...@@ -208,14 +208,6 @@ static int vc4_dpi_connector_get_modes(struct drm_connector *connector) ...@@ -208,14 +208,6 @@ static int vc4_dpi_connector_get_modes(struct drm_connector *connector)
return 0; return 0;
} }
static struct drm_encoder *
vc4_dpi_connector_best_encoder(struct drm_connector *connector)
{
struct vc4_dpi_connector *dpi_connector =
to_vc4_dpi_connector(connector);
return dpi_connector->encoder;
}
static const struct drm_connector_funcs vc4_dpi_connector_funcs = { static const struct drm_connector_funcs vc4_dpi_connector_funcs = {
.dpms = drm_atomic_helper_connector_dpms, .dpms = drm_atomic_helper_connector_dpms,
.detect = vc4_dpi_connector_detect, .detect = vc4_dpi_connector_detect,
...@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_dpi_connector_funcs = { ...@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_dpi_connector_funcs = {
static const struct drm_connector_helper_funcs vc4_dpi_connector_helper_funcs = { static const struct drm_connector_helper_funcs vc4_dpi_connector_helper_funcs = {
.get_modes = vc4_dpi_connector_get_modes, .get_modes = vc4_dpi_connector_get_modes,
.best_encoder = vc4_dpi_connector_best_encoder,
}; };
static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev, static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
......
...@@ -208,14 +208,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) ...@@ -208,14 +208,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
return ret; return ret;
} }
static struct drm_encoder *
vc4_hdmi_connector_best_encoder(struct drm_connector *connector)
{
struct vc4_hdmi_connector *hdmi_connector =
to_vc4_hdmi_connector(connector);
return hdmi_connector->encoder;
}
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
.dpms = drm_atomic_helper_connector_dpms, .dpms = drm_atomic_helper_connector_dpms,
.detect = vc4_hdmi_connector_detect, .detect = vc4_hdmi_connector_detect,
...@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { ...@@ -228,7 +220,6 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = { static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = {
.get_modes = vc4_hdmi_connector_get_modes, .get_modes = vc4_hdmi_connector_get_modes,
.best_encoder = vc4_hdmi_connector_best_encoder,
}; };
static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev, static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment