From 6b33379c55a8368ce9e5ed1381f9aeeebe383dfe Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 14 May 2014 15:22:49 +0300 Subject: 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 Reviewed-on: http://git-master/r/410205 --- drivers/gpu/nvgpu/gk20a/gk20a.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') 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) goto done; } - err = gk20a_init_pmu_setup_hw2(g); - if (err) { - gk20a_err(dev, "failed to init gk20a pmu_hw2"); - goto done; - } - err = gk20a_init_therm_support(g); if (err) { gk20a_err(dev, "failed to init gk20a therm"); @@ -1471,6 +1465,8 @@ static int gk20a_probe(struct platform_device *dev) cfb_add_device(&dev->dev); #endif + gk20a_init_gr(gk20a); + return 0; } -- cgit v1.2.2