diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-14 08:22:49 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:05 -0400 |
commit | 6b33379c55a8368ce9e5ed1381f9aeeebe383dfe (patch) | |
tree | 625ae2366c0b21d9c4b18255f691f506debfcbfb /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | cd13ee4aafcdb0206078e9e41aca53107235bbed (diff) |
gpu: nvgpu: Rewrite PMU boot-up sequence
Rewrite PMU boot sequence as a state machine. At PMU power-up send
initial messages, and reset state machine. At each reply from PMU,
do the next stage of PMU boot and set state.
As now PMU and FECS boot are independent, we need to ensure engine
idle before saving ZBC.
Change-Id: I1ea747ab794ef08f1784eeabfdae7655d585ff21
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/410205
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 6de264f4..b9cba434 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -900,12 +900,6 @@ static int gk20a_pm_finalize_poweron(struct device *dev) | |||
900 | goto done; | 900 | goto done; |
901 | } | 901 | } |
902 | 902 | ||
903 | err = gk20a_init_pmu_setup_hw2(g); | ||
904 | if (err) { | ||
905 | gk20a_err(dev, "failed to init gk20a pmu_hw2"); | ||
906 | goto done; | ||
907 | } | ||
908 | |||
909 | err = gk20a_init_therm_support(g); | 903 | err = gk20a_init_therm_support(g); |
910 | if (err) { | 904 | if (err) { |
911 | gk20a_err(dev, "failed to init gk20a therm"); | 905 | gk20a_err(dev, "failed to init gk20a therm"); |
@@ -1471,6 +1465,8 @@ static int gk20a_probe(struct platform_device *dev) | |||
1471 | cfb_add_device(&dev->dev); | 1465 | cfb_add_device(&dev->dev); |
1472 | #endif | 1466 | #endif |
1473 | 1467 | ||
1468 | gk20a_init_gr(gk20a); | ||
1469 | |||
1474 | return 0; | 1470 | return 0; |
1475 | } | 1471 | } |
1476 | 1472 | ||