diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_pg.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index 2d0fc499..30bf9008 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -374,12 +374,6 @@ static int pmu_pg_init_send(struct gk20a *g, u32 pg_engine_id) | |||
374 | 374 | ||
375 | nvgpu_log_fn(g, " "); | 375 | nvgpu_log_fn(g, " "); |
376 | 376 | ||
377 | if (pmu->pmu_state == PMU_STATE_INIT_RECEIVED) | ||
378 | nvgpu_pmu_state_change(g, | ||
379 | PMU_STATE_ELPG_BOOTING, false); | ||
380 | else | ||
381 | nvgpu_err(g, "PMU INIT not received\n"); | ||
382 | |||
383 | gk20a_pmu_pg_idle_counter_config(g, pg_engine_id); | 377 | gk20a_pmu_pg_idle_counter_config(g, pg_engine_id); |
384 | 378 | ||
385 | if (g->ops.pmu.pmu_pg_init_param) | 379 | if (g->ops.pmu.pmu_pg_init_param) |
@@ -446,6 +440,7 @@ int nvgpu_pmu_init_powergating(struct gk20a *g) | |||
446 | { | 440 | { |
447 | u32 pg_engine_id; | 441 | u32 pg_engine_id; |
448 | u32 pg_engine_id_list = 0; | 442 | u32 pg_engine_id_list = 0; |
443 | struct nvgpu_pmu *pmu = &g->pmu; | ||
449 | 444 | ||
450 | nvgpu_log_fn(g, " "); | 445 | nvgpu_log_fn(g, " "); |
451 | 446 | ||
@@ -459,6 +454,9 @@ int nvgpu_pmu_init_powergating(struct gk20a *g) | |||
459 | pg_engine_id++) { | 454 | pg_engine_id++) { |
460 | 455 | ||
461 | if (BIT(pg_engine_id) & pg_engine_id_list) { | 456 | if (BIT(pg_engine_id) & pg_engine_id_list) { |
457 | if (pmu && pmu->pmu_state == PMU_STATE_INIT_RECEIVED) | ||
458 | nvgpu_pmu_state_change(g, | ||
459 | PMU_STATE_ELPG_BOOTING, false); | ||
462 | pmu_pg_init_send(g, pg_engine_id); | 460 | pmu_pg_init_send(g, pg_engine_id); |
463 | } | 461 | } |
464 | } | 462 | } |