diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-05-22 09:57:15 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-06-05 23:14:46 +0200 |
| commit | 9910f5c455de10f0eb2559093a7adad65f6c05cd (patch) | |
| tree | d1858225e96d9861c43900141dcf09a08e8f82c0 /drivers/gpu/drm/tegra/sor.c | |
| parent | b528ae7190867cd079bae5d6cf48c17d673428ae (diff) | |
| download | talos-obmc-linux-9910f5c455de10f0eb2559093a7adad65f6c05cd.tar.gz talos-obmc-linux-9910f5c455de10f0eb2559093a7adad65f6c05cd.zip | |
drm/tegra: Remove host1x drm_bus implementation
The DRM core can now cope with drivers that don't have an associated
struct drm_bus, so the host1x implementation is no longer useful.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 7d66f6e53919..5c67d97bd21d 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1044,7 +1044,7 @@ static int tegra_sor_debugfs_exit(struct tegra_sor *sor) static int tegra_sor_init(struct host1x_client *client) { - struct tegra_drm *tegra = dev_get_drvdata(client->parent); + struct drm_device *drm = dev_get_drvdata(client->parent); struct tegra_sor *sor = host1x_client_to_sor(client); int err; @@ -1056,14 +1056,14 @@ static int tegra_sor_init(struct host1x_client *client) sor->output.dev = sor->dev; sor->output.ops = &sor_ops; - err = tegra_output_init(tegra->drm, &sor->output); + err = tegra_output_init(drm, &sor->output); if (err < 0) { dev_err(sor->dev, "output setup failed: %d\n", err); return err; } if (IS_ENABLED(CONFIG_DEBUG_FS)) { - struct dentry *root = tegra->drm->primary->debugfs_root; + struct dentry *root = drm->primary->debugfs_root; err = tegra_sor_debugfs_init(sor, root); if (err < 0) |
