aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/dev.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2013-03-22 10:34:09 -0400
committerThierry Reding <thierry.reding@avionic-design.de>2013-04-22 06:40:04 -0400
commitd43f81cbaf43531a977e8b4c4427f19acf8a5061 (patch)
tree76fbf323c5df37de5a29f52817ddc4953328d213 /drivers/gpu/host1x/dev.c
parentde2ba664c30fcdb0f678ab6cbb57e01a0b206085 (diff)
drm/tegra: Add gr2d device
Add client driver for 2D device, and IOCTLs to pass work to host1x channel for 2D. Also adds functions that can be called to access sync points from DRM. 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.c')
-rw-r--r--drivers/gpu/host1x/dev.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 8ce9889cefd5..28e28a23d444 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -209,11 +209,17 @@ static int __init tegra_host1x_init(void)
209 err = platform_driver_register(&tegra_hdmi_driver); 209 err = platform_driver_register(&tegra_hdmi_driver);
210 if (err < 0) 210 if (err < 0)
211 goto unregister_dc; 211 goto unregister_dc;
212
213 err = platform_driver_register(&tegra_gr2d_driver);
214 if (err < 0)
215 goto unregister_hdmi;
212#endif 216#endif
213 217
214 return 0; 218 return 0;
215 219
216#ifdef CONFIG_DRM_TEGRA 220#ifdef CONFIG_DRM_TEGRA
221unregister_hdmi:
222 platform_driver_unregister(&tegra_hdmi_driver);
217unregister_dc: 223unregister_dc:
218 platform_driver_unregister(&tegra_dc_driver); 224 platform_driver_unregister(&tegra_dc_driver);
219unregister_host1x: 225unregister_host1x:
@@ -226,6 +232,7 @@ module_init(tegra_host1x_init);
226static void __exit tegra_host1x_exit(void) 232static void __exit tegra_host1x_exit(void)
227{ 233{
228#ifdef CONFIG_DRM_TEGRA 234#ifdef CONFIG_DRM_TEGRA
235 platform_driver_unregister(&tegra_gr2d_driver);
229 platform_driver_unregister(&tegra_hdmi_driver); 236 platform_driver_unregister(&tegra_hdmi_driver);
230 platform_driver_unregister(&tegra_dc_driver); 237 platform_driver_unregister(&tegra_dc_driver);
231#endif 238#endif