summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2016-11-16 01:48:06 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-10 23:15:59 -0500
commitd8049d384fab27de0075aa5dff9dbf4874b19eb9 (patch)
tree4abd0a19df9e0148da10ffd2c9ea1e0757dff4d1 /drivers
parent8d712cd23596ec53e519ac531348f5ee93fc7717 (diff)
gpu: nvgpu: pmu->pmu_state update
- set pmu->pmu_state to PMU_STATE_ELPG_BOOTED only for ELPG after PMU_STATE_ELPG_BOOTING state Bug N/A Change-Id: I08480e2afd5a5050a903327b91e43b25780cdaf8 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: http://git-master/r/1254429 (cherry picked from commit d68f4f91796d1d98dbc1b5b24d526fe2e487966f) Reviewed-on: http://git-master/r/1271616 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 4654491f..af6ff1da 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -3376,7 +3376,6 @@ static void pmu_handle_pg_elpg_msg(struct gk20a *g, struct pmu_msg *msg,
3376 else if (elpg_msg->engine_id == PMU_PG_ELPG_ENGINE_ID_MS) 3376 else if (elpg_msg->engine_id == PMU_PG_ELPG_ENGINE_ID_MS)
3377 *ack_status = 1; 3377 *ack_status = 1;
3378 if (pmu->pmu_state == PMU_STATE_ELPG_BOOTING) { 3378 if (pmu->pmu_state == PMU_STATE_ELPG_BOOTING) {
3379 pmu->pmu_state = PMU_STATE_ELPG_BOOTED;
3380 if (g->ops.pmu.pmu_pg_engines_feature_list && 3379 if (g->ops.pmu.pmu_pg_engines_feature_list &&
3381 g->ops.pmu.pmu_pg_engines_feature_list(g, 3380 g->ops.pmu.pmu_pg_engines_feature_list(g,
3382 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) != 3381 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) !=
@@ -3384,8 +3383,10 @@ static void pmu_handle_pg_elpg_msg(struct gk20a *g, struct pmu_msg *msg,
3384 pmu->initialized = true; 3383 pmu->initialized = true;
3385 pmu->pmu_state = PMU_STATE_STARTED; 3384 pmu->pmu_state = PMU_STATE_STARTED;
3386 pmu->mscg_stat = PMU_MSCG_DISABLED; 3385 pmu->mscg_stat = PMU_MSCG_DISABLED;
3387 } else 3386 } else {
3387 pmu->pmu_state = PMU_STATE_ELPG_BOOTED;
3388 schedule_work(&pmu->pg_init); 3388 schedule_work(&pmu->pg_init);
3389 }
3389 } 3390 }
3390 break; 3391 break;
3391 default: 3392 default: