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/sor.c | |
| parent | drm/tegra: debugfs cleanup cannot fail (diff) | |
| download | linux-dev-ea130b240de820559408eba12b00412326af36ec.tar.xz linux-dev-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/sor.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a1c16c5c0cf6..ee18adf7f653 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1343,9 +1343,6 @@ static int tegra_sor_init(struct host1x_client *client) &tegra_sor_connector_helper_funcs); sor->output.connector.dpms = DRM_MODE_DPMS_OFF; - if (sor->output.panel) - drm_panel_attach(sor->output.panel, &sor->output.connector); - drm_encoder_init(drm, &sor->output.encoder, &tegra_sor_encoder_funcs, DRM_MODE_ENCODER_TMDS); drm_encoder_helper_add(&sor->output.encoder, @@ -1355,10 +1352,13 @@ static int tegra_sor_init(struct host1x_client *client) &sor->output.encoder); drm_connector_register(&sor->output.connector); - sor->output.encoder.possible_crtcs = 0x3; + err = tegra_output_init(drm, &sor->output); + if (err < 0) { + dev_err(client->dev, "failed to initialize output: %d\n", err); + return err; + } - if (gpio_is_valid(sor->output.hpd_gpio)) - enable_irq(sor->output.hpd_irq); + sor->output.encoder.possible_crtcs = 0x3; if (IS_ENABLED(CONFIG_DEBUG_FS)) { err = tegra_sor_debugfs_init(sor, drm->primary); |