From 5aa9aefb85d2fe206f604ce76ffd344aeea4b8ba Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 30 Mar 2012 12:44:40 +0300 Subject: video: tegra: host: Init scale3d worker always Initialize scale3d worker even though scale3d would be disabled. Bug 954879 Change-Id: Iaf3a12740d1d377d949cdfbf7e11fa00568e72fe Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/93488 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mayuresh Kulkarni Reviewed-by: Juha Tukkinen --- drivers/video/tegra/host/gr3d/scale3d.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/tegra/host/gr3d/scale3d.c b/drivers/video/tegra/host/gr3d/scale3d.c index 8a267a127ea9..5922b55a836a 100644 --- a/drivers/video/tegra/host/gr3d/scale3d.c +++ b/drivers/video/tegra/host/gr3d/scale3d.c @@ -540,6 +540,9 @@ void nvhost_scale3d_init(struct nvhost_device *d) long correction; mutex_init(&scale3d.lock); + INIT_WORK(&scale3d.work, scale3d_clocks_handler); + INIT_DELAYED_WORK(&scale3d.idle_timer, scale3d_idle_handler); + scale3d.clk_3d = d->clk[0]; if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA3) { scale3d.clk_3d2 = d->clk[1]; @@ -629,9 +632,6 @@ void nvhost_scale3d_init(struct nvhost_device *d) POW2(scale3d.max_rate_3d - scale3d.emc_xmid); scale3d.emc_dip_offset -= correction; - INIT_WORK(&scale3d.work, scale3d_clocks_handler); - INIT_DELAYED_WORK(&scale3d.idle_timer, scale3d_idle_handler); - /* set scaling parameter defaults */ scale3d.enable = 1; scale3d.period = scale3d.p_period = 100000; -- cgit v1.2.3