diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2013-03-22 15:34:07 +0100 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-04-22 12:39:59 +0200 |
| commit | 692e6d7be8099225f04b2d97299bc03479a5fcdb (patch) | |
| tree | 13e5a72eeaca72c0b73a668f5f683df6e01619d0 /drivers/gpu/host1x/dev.h | |
| parent | gpu: host1x: drm: Rename host1x to host1x_drm (diff) | |
| download | linux-692e6d7be8099225f04b2d97299bc03479a5fcdb.tar.xz linux-692e6d7be8099225f04b2d97299bc03479a5fcdb.zip | |
gpu: host1x: Remove second host1x driver
Remove second host1x driver, and bind tegra-drm to the new host1x
driver. The logic to parse device tree and track clients is moved
to drm.c.
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/gpu/host1x/dev.h')
| -rw-r--r-- | drivers/gpu/host1x/dev.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/dev.h b/drivers/gpu/host1x/dev.h index 4d16fe92400a..a1607d6e135b 100644 --- a/drivers/gpu/host1x/dev.h +++ b/drivers/gpu/host1x/dev.h @@ -124,6 +124,8 @@ struct host1x { unsigned int num_allocated_channels; struct dentry *debugfs; + + void *drm_data; }; void host1x_sync_writel(struct host1x *host1x, u32 r, u32 v); @@ -299,4 +301,8 @@ static inline void host1x_hw_show_mlocks(struct host1x *host, struct output *o) host->debug_op->show_mlocks(host, o); } +extern struct platform_driver tegra_hdmi_driver; +extern struct platform_driver tegra_dc_driver; +extern struct platform_driver tegra_gr2d_driver; + #endif |