diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2012-05-22 15:23:13 +0300 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-14 16:29:46 -0700 |
| commit | 9774bbe31a0741ad71929156f59afdb2aba4eae5 (patch) | |
| tree | 97246003d1c10c6bf934d4080e01492c50acbdb8 /drivers/video/tegra/host/gr3d/gr3d.c | |
| parent | d02edba6153149b30fbbd5eb9dec91f42eb0d732 (diff) | |
video: tegra: host: Register devices in SoC files
Move the device structures to the driver source code files. Register
all nvhost_device's in one loop which is called from board file.
host1x driver code is moved to live under host1x, too. This causes
a need to add host to include path of tegradc and nvavp.
Bug 982965
Change-Id: If99cf9d1ef6bc24663ee8294c19370429ed04ca7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/104076
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/gr3d/gr3d.c')
| -rw-r--r-- | drivers/video/tegra/host/gr3d/gr3d.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/video/tegra/host/gr3d/gr3d.c b/drivers/video/tegra/host/gr3d/gr3d.c index 3208ba452bff..d586e26f104d 100644 --- a/drivers/video/tegra/host/gr3d/gr3d.c +++ b/drivers/video/tegra/host/gr3d/gr3d.c @@ -19,6 +19,7 @@ */ #include <linux/slab.h> +#include <mach/gpufuse.h> #include "t20/t20.h" #include "host1x/host1x_channel.h" @@ -35,12 +36,6 @@ #include "nvhost_memmgr.h" #include "chip_support.h" -#include <mach/hardware.h> - -#ifndef TEGRA_POWERGATE_3D1 -#define TEGRA_POWERGATE_3D1 -1 -#endif - void nvhost_3dctx_restore_begin(struct host1x_hwctx_handler *p, u32 *ptr) { /* set class to host */ @@ -224,6 +219,7 @@ static int __devinit gr3d_probe(struct nvhost_device *dev, * found in clock tree */ dev->name = "gr3d"; + nvhost_set_register_sets(tegra_gpu_register_sets()); return nvhost_client_device_init(dev); } @@ -244,8 +240,6 @@ static int gr3d_resume(struct nvhost_device *dev) return 0; } -struct nvhost_device *gr3d_device; - static struct nvhost_driver gr3d_driver = { .probe = gr3d_probe, .remove = __exit_p(gr3d_remove), @@ -262,18 +256,6 @@ static struct nvhost_driver gr3d_driver = { static int __init gr3d_init(void) { - int err; - - gr3d_device = nvhost_get_device("gr3d"); - if (!gr3d_device) - return -ENXIO; - - err = nvhost_device_register(gr3d_device); - if (err) { - pr_err("Could not register 3D device\n"); - return err; - } - return nvhost_driver_register(&gr3d_driver); } |