diff options
| author | Winnie Hsu <whsu@nvidia.com> | 2015-06-18 16:13:29 -0700 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2015-06-19 11:31:59 -0700 |
| commit | 554875650a0dcf0f1c8d4e8d7a56bd03b3b9a812 (patch) | |
| tree | 19b64dbf7e57655f1fa56aa4baf0b68ec687434f /drivers/gpu | |
| parent | b4fc4edbe1b78f43acdb4425e647e0a433e9f5e2 (diff) | |
Revert "video: tegra: Wait PMU finishes booting"
This reverts commit f69b7093accdacfa653b4bd45d78e04a2676dc2a.
Bug 200055546
Bug 200114503
Change-Id: I165a3da9f418657d86bf39fbe3db2adc13762c87
Signed-off-by: Winnie Hsu <whsu@nvidia.com>
Reviewed-on: http://git-master/r/759875
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index f5f2c130241d..ec391057491f 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -914,8 +914,6 @@ static int gk20a_pm_finalize_poweron(struct device *dev) goto done; } - wait_event(g->pmu.boot_wq, g->pmu.pmu_state == PMU_STATE_STARTED); - gk20a_channel_resume(g); set_user_nice(current, nice_value); @@ -1470,7 +1468,6 @@ static int gk20a_probe(struct platform_device *dev) &gk20a->timeouts_enabled); gk20a_pmu_debugfs_init(dev); #endif - init_waitqueue_head(&gk20a->pmu.boot_wq); gk20a_init_gr(gk20a); diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index f3d6e00c5ae0..13da5e8098c2 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -1900,8 +1900,6 @@ static void pmu_setup_hw_enable_elpg(struct gk20a *g) gk20a_aelpg_init(g); gk20a_aelpg_init_and_enable(g, PMU_AP_CTRL_ID_GRAPHICS); } - - wake_up(&g->pmu.boot_wq); } int gk20a_init_pmu_support(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 15fb82a9d26b..c48958e6910f 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h @@ -1035,7 +1035,6 @@ struct pmu_gk20a { u32 elpg_stat; int pmu_state; - wait_queue_head_t boot_wq; #define PMU_ELPG_ENABLE_ALLOW_DELAY_MSEC 1 /* msec */ struct work_struct pg_init; |