From 8311718a6b9375730ee2f1c036005ab1923059cd Mon Sep 17 00:00:00 2001 From: Mayuresh Kulkarni Date: Mon, 5 Mar 2012 18:36:47 +0530 Subject: video: tegra: host: register nvhost master device in board-xxx-panel.c - the suspend order of devices is governed by the order in which devices are registered - this commit ensures that nvhost master is registered before any of the graphics devices - previously this was done in rootfs_init call which is later than arch_init calls of board-xxx-panel.c - this caused tegra-dc device to be registered *before* nvhost master device. as a result it was suspended *later* than nvhost master device. this is a clear violation of dependency rule for nvhost. this caused suspend-resume to fail for L4T - this worked on android as it has CONFIG early suspend enabled while it failed for L4T which doesn't have CONFIG early suspend enabled Bug 947617 Change-Id: I6cd405f3ba23d004e7659140019f5130e6c25159 Signed-off-by: Mayuresh Kulkarni Reviewed-on: http://git-master/r/87756 Reviewed-by: Terje Bergstrom --- arch/arm/mach-tegra/board-kai-panel.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm/mach-tegra/board-kai-panel.c') diff --git a/arch/arm/mach-tegra/board-kai-panel.c b/arch/arm/mach-tegra/board-kai-panel.c index b98c91601e64..71e238fdcdcf 100644 --- a/arch/arm/mach-tegra/board-kai-panel.c +++ b/arch/arm/mach-tegra/board-kai-panel.c @@ -700,6 +700,12 @@ int __init kai_panel_init(void) register_early_suspend(&kai_panel_early_suspender); #endif +#ifdef CONFIG_TEGRA_GRHOST + err = nvhost_device_register(&tegra_grhost_device); + if (err) + return err; +#endif + err = platform_add_devices(kai_gfx_devices, ARRAY_SIZE(kai_gfx_devices)); -- cgit v1.2.3