From 692e6d7be8099225f04b2d97299bc03479a5fcdb Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 22 Mar 2013 16:34:07 +0200 Subject: 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 Signed-off-by: Terje Bergstrom Reviewed-by: Thierry Reding Tested-by: Thierry Reding Tested-by: Erik Faye-Lund Signed-off-by: Thierry Reding --- drivers/gpu/host1x/dev.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/gpu/host1x/dev.h') 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 -- cgit v1.2.3