diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-12-19 15:51:35 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-01-27 10:14:49 +0100 |
| commit | ea130b240de820559408eba12b00412326af36ec (patch) | |
| tree | 0ef4b9e74b289c9e04d40d6cba3cadc0b78e082a /drivers/gpu/drm/tegra/rgb.c | |
| parent | drm/tegra: debugfs cleanup cannot fail (diff) | |
| download | linux-ea130b240de820559408eba12b00412326af36ec.tar.xz linux-ea130b240de820559408eba12b00412326af36ec.zip | |
drm/tegra: Remove remnants of the output midlayer
The tegra_output midlayer is now completely gone and output drivers use
it purely as a helper library.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra/rgb.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/rgb.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index 30d7ae02ace8..ab6093889be8 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -315,13 +315,6 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) &tegra_rgb_connector_helper_funcs); output->connector.dpms = DRM_MODE_DPMS_OFF; - if (output->panel) { - err = drm_panel_attach(output->panel, &output->connector); - if (err < 0) - dev_err(output->dev, "failed to attach panel: %d\n", - err); - } - drm_encoder_init(drm, &output->encoder, &tegra_rgb_encoder_funcs, DRM_MODE_ENCODER_LVDS); drm_encoder_helper_add(&output->encoder, @@ -331,6 +324,12 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) &output->encoder); drm_connector_register(&output->connector); + err = tegra_output_init(drm, output); + if (err < 0) { + dev_err(output->dev, "failed to initialize output: %d\n", err); + return err; + } + /* * Other outputs can be attached to either display controller. The RGB * outputs are an exception and work only with their parent display |