diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-28 15:38:40 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-12-19 15:02:45 +0100 |
| commit | 2318840464db0ebda4144a18f6b657c63dcebf9c (patch) | |
| tree | 38779c8705bbb67e92f83a75713b22248b1dfcba | |
| parent | 01abc3458e8dfab96a9aa8e63db983e3d819190c (diff) | |
drm/tegra: Convert output midlayer to helpers
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/gpu/drm/tegra/drm.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/output.c | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 286a970a443..5d76efe9272 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -272,6 +272,12 @@ int tegra_output_remove(struct tegra_output *output); int tegra_output_init(struct drm_device *drm, struct tegra_output *output); int tegra_output_exit(struct tegra_output *output); +int tegra_output_connector_get_modes(struct drm_connector *connector); +void tegra_output_connector_destroy(struct drm_connector *connector); +struct drm_encoder * +tegra_output_connector_best_encoder(struct drm_connector *connector); +void tegra_output_encoder_destroy(struct drm_encoder *encoder); + /* from dpaux.c */ struct tegra_dpaux; struct drm_dp_link; diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index c40b38e4a85..debb7ed67f7 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -12,7 +12,7 @@ #include <drm/drm_panel.h> #include "drm.h" -static int tegra_connector_get_modes(struct drm_connector *connector) +int tegra_output_connector_get_modes(struct drm_connector *connector) { struct tegra_output *output = connector_to_output(connector); struct edid *edid = NULL; @@ -57,8 +57,8 @@ static int tegra_connector_mode_valid(struct drm_connector *connector, return status; } -static struct drm_encoder * -tegra_connector_best_encoder(struct drm_connector *connector) +struct drm_encoder * +tegra_output_connector_best_encoder(struct drm_connector *connector) { struct tegra_output *output = connector_to_output(connector); @@ -66,9 +66,9 @@ tegra_connector_best_encoder(struct drm_connector *connector) } static const struct drm_connector_helper_funcs connector_helper_funcs = { - .get_modes = tegra_connector_get_modes, + .get_modes = tegra_output_connector_get_modes, .mode_valid = tegra_connector_mode_valid, - .best_encoder = tegra_connector_best_encoder, + .best_encoder = tegra_output_connector_best_encoder, }; static enum drm_connector_status @@ -98,7 +98,7 @@ tegra_connector_detect(struct drm_connector *connector, bool force) return status; } -static void tegra_connector_destroy(struct drm_connector *connector) +void tegra_output_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); drm_connector_cleanup(connector); @@ -108,16 +108,16 @@ static const struct drm_connector_funcs connector_funcs = { .dpms = drm_helper_connector_dpms, .detect = tegra_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = tegra_connector_destroy, + .destroy = tegra_output_connector_destroy, }; -static void tegra_encoder_destroy(struct drm_encoder *encoder) +void tegra_output_encoder_destroy(struct drm_encoder *encoder) { drm_encoder_cleanup(encoder); } static const struct drm_encoder_funcs encoder_funcs = { - .destroy = tegra_encoder_destroy, + .destroy = tegra_output_encoder_destroy, }; static void tegra_encoder_dpms(struct drm_encoder *encoder, int mode) |