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/gr3d.c | |
parent | b528ae7190867cd079bae5d6cf48c17d673428ae (diff) | |
download | blackbird-op-linux-9910f5c455de10f0eb2559093a7adad65f6c05cd.tar.gz blackbird-op-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/gr3d.c')
-rw-r--r-- | drivers/gpu/drm/tegra/gr3d.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c index 0cbb24b1ae04..30f5ba9bd6d0 100644 --- a/drivers/gpu/drm/tegra/gr3d.c +++ b/drivers/gpu/drm/tegra/gr3d.c @@ -37,7 +37,7 @@ static inline struct gr3d *to_gr3d(struct tegra_drm_client *client) static int gr3d_init(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct tegra_drm *tegra = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->parent); unsigned long flags = HOST1X_SYNCPT_HAS_BASE; struct gr3d *gr3d = to_gr3d(drm); @@ -51,17 +51,17 @@ static int gr3d_init(struct host1x_client *client) return -ENOMEM; } - return tegra_drm_register_client(tegra, drm); + return tegra_drm_register_client(dev->dev_private, drm); } static int gr3d_exit(struct host1x_client *client) { struct tegra_drm_client *drm = host1x_to_drm_client(client); - struct tegra_drm *tegra = dev_get_drvdata(client->parent); + struct drm_device *dev = dev_get_drvdata(client->parent); struct gr3d *gr3d = to_gr3d(drm); int err; - err = tegra_drm_unregister_client(tegra, drm); + err = tegra_drm_unregister_client(dev->dev_private, drm); if (err < 0) return err; |