diff options
author | Supriya <ssharatkumar@nvidia.com> | 2015-12-10 02:26:59 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-02-26 15:29:55 -0500 |
commit | 640cb6642fdb0ad5a4039aacf6c46e1ac30537a3 (patch) | |
tree | 338997402fccd97f28b7b653d1f1b64ca15678db /drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |
parent | 6d585840ad5887407512dd292698100df50e5eed (diff) |
gpu: nvgpu: LRF, TEX, LTC, DRAM override
- Adding support for FECS mem overrides
Bug 1699676
Change-Id: I6c9ddcd98d57b29059513ee508c6f92b194c4fc7
Signed-off-by: Supriya <ssharatkumar@nvidia.com>
Reviewed-on: http://git-master/r/921253
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index ee64b90f..9f137246 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -1300,6 +1300,8 @@ static int gm20b_init_pmu_setup_hw1(struct gk20a *g, | |||
1300 | pmu_enable_irq(pmu, false); | 1300 | pmu_enable_irq(pmu, false); |
1301 | pmu->isr_enabled = false; | 1301 | pmu->isr_enabled = false; |
1302 | mutex_unlock(&pmu->isr_mutex); | 1302 | mutex_unlock(&pmu->isr_mutex); |
1303 | /*Clearing mailbox register used to reflect capabilities*/ | ||
1304 | gk20a_writel(g, pwr_falcon_mailbox1_r(), 0); | ||
1303 | err = bl_bootstrap(pmu, desc, bl_sz); | 1305 | err = bl_bootstrap(pmu, desc, bl_sz); |
1304 | if (err) | 1306 | if (err) |
1305 | return err; | 1307 | return err; |
@@ -1436,6 +1438,8 @@ int pmu_wait_for_halt(struct gk20a *g, unsigned int timeout) | |||
1436 | if (completion) | 1438 | if (completion) |
1437 | gk20a_err(dev_from_gk20a(g), "ACR boot timed out"); | 1439 | gk20a_err(dev_from_gk20a(g), "ACR boot timed out"); |
1438 | else { | 1440 | else { |
1441 | g->acr.capabilities = gk20a_readl(g, pwr_falcon_mailbox1_r()); | ||
1442 | gm20b_dbg_pmu("ACR capabilities %x\n", g->acr.capabilities); | ||
1439 | data = gk20a_readl(g, pwr_falcon_mailbox0_r()); | 1443 | data = gk20a_readl(g, pwr_falcon_mailbox0_r()); |
1440 | if (data) { | 1444 | if (data) { |
1441 | gk20a_err(dev_from_gk20a(g), | 1445 | gk20a_err(dev_from_gk20a(g), |