Commit 26b4ee34 authored by Boris Brezillon's avatar Boris Brezillon Committed by Daniel Vetter

drm: tegra: 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() implementation 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-14-git-send-email-boris.brezillon@free-electrons.com
parent 99410f35
...@@ -239,8 +239,6 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output); ...@@ -239,8 +239,6 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output);
void tegra_output_exit(struct tegra_output *output); void tegra_output_exit(struct tegra_output *output);
int tegra_output_connector_get_modes(struct drm_connector *connector); int tegra_output_connector_get_modes(struct drm_connector *connector);
struct drm_encoder *
tegra_output_connector_best_encoder(struct drm_connector *connector);
enum drm_connector_status enum drm_connector_status
tegra_output_connector_detect(struct drm_connector *connector, bool force); tegra_output_connector_detect(struct drm_connector *connector, bool force);
void tegra_output_connector_destroy(struct drm_connector *connector); void tegra_output_connector_destroy(struct drm_connector *connector);
......
...@@ -794,7 +794,6 @@ tegra_dsi_connector_mode_valid(struct drm_connector *connector, ...@@ -794,7 +794,6 @@ tegra_dsi_connector_mode_valid(struct drm_connector *connector,
static const struct drm_connector_helper_funcs tegra_dsi_connector_helper_funcs = { static const struct drm_connector_helper_funcs tegra_dsi_connector_helper_funcs = {
.get_modes = tegra_output_connector_get_modes, .get_modes = tegra_output_connector_get_modes,
.mode_valid = tegra_dsi_connector_mode_valid, .mode_valid = tegra_dsi_connector_mode_valid,
.best_encoder = tegra_output_connector_best_encoder,
}; };
static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = { static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = {
......
...@@ -806,7 +806,6 @@ static const struct drm_connector_helper_funcs ...@@ -806,7 +806,6 @@ static const struct drm_connector_helper_funcs
tegra_hdmi_connector_helper_funcs = { tegra_hdmi_connector_helper_funcs = {
.get_modes = tegra_output_connector_get_modes, .get_modes = tegra_output_connector_get_modes,
.mode_valid = tegra_hdmi_connector_mode_valid, .mode_valid = tegra_hdmi_connector_mode_valid,
.best_encoder = tegra_output_connector_best_encoder,
}; };
static const struct drm_encoder_funcs tegra_hdmi_encoder_funcs = { static const struct drm_encoder_funcs tegra_hdmi_encoder_funcs = {
......
...@@ -42,14 +42,6 @@ int tegra_output_connector_get_modes(struct drm_connector *connector) ...@@ -42,14 +42,6 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
return err; return err;
} }
struct drm_encoder *
tegra_output_connector_best_encoder(struct drm_connector *connector)
{
struct tegra_output *output = connector_to_output(connector);
return &output->encoder;
}
enum drm_connector_status enum drm_connector_status
tegra_output_connector_detect(struct drm_connector *connector, bool force) tegra_output_connector_detect(struct drm_connector *connector, bool force)
{ {
......
...@@ -112,7 +112,6 @@ tegra_rgb_connector_mode_valid(struct drm_connector *connector, ...@@ -112,7 +112,6 @@ tegra_rgb_connector_mode_valid(struct drm_connector *connector,
static const struct drm_connector_helper_funcs tegra_rgb_connector_helper_funcs = { static const struct drm_connector_helper_funcs tegra_rgb_connector_helper_funcs = {
.get_modes = tegra_output_connector_get_modes, .get_modes = tegra_output_connector_get_modes,
.mode_valid = tegra_rgb_connector_mode_valid, .mode_valid = tegra_rgb_connector_mode_valid,
.best_encoder = tegra_output_connector_best_encoder,
}; };
static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = { static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = {
......
...@@ -1087,7 +1087,6 @@ tegra_sor_connector_mode_valid(struct drm_connector *connector, ...@@ -1087,7 +1087,6 @@ tegra_sor_connector_mode_valid(struct drm_connector *connector,
static const struct drm_connector_helper_funcs tegra_sor_connector_helper_funcs = { static const struct drm_connector_helper_funcs tegra_sor_connector_helper_funcs = {
.get_modes = tegra_sor_connector_get_modes, .get_modes = tegra_sor_connector_get_modes,
.mode_valid = tegra_sor_connector_mode_valid, .mode_valid = tegra_sor_connector_mode_valid,
.best_encoder = tegra_output_connector_best_encoder,
}; };
static const struct drm_encoder_funcs tegra_sor_encoder_funcs = { static const struct drm_encoder_funcs tegra_sor_encoder_funcs = {
......
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