nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: PMU IMEM/DMEM scrubbing cleanup

Browse Source 
PMU IMEM/DMEM scrubbing completion check is part of
PMU reset, so removing explicit IMEM/DMEM scrubbing
check

NVGPU JIRA-99

Change-Id: I4553701fd8c08217e109ef3a5fe1e33e372c26d4
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master/r/1510202
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
This commit is contained in:
Mahantesh Kumbar
2017-06-28 23:00:04 +05:30
committed by mobile promotions
parent b61a395106
commit d2486cf1b1
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/nvgpu/gm206/bios_gm206.c
View File

@@ -105,25 +105,8 @@ static int gm206_bios_devinit(struct gk20a *g)
struct nvgpu_timeout timeout; struct nvgpu_timeout timeout;
gk20a_dbg_fn(""); gk20a_dbg_fn("");
nvgpu_flcn_reset(g->pmu.flcn);
nvgpu_timeout_init(g, &timeout, if (nvgpu_flcn_reset(g->pmu.flcn)) {
PMU_BOOT_TIMEOUT_MAX /
PMU_BOOT_TIMEOUT_DEFAULT,
NVGPU_TIMER_RETRY_TIMER);
do {
u32 w = gk20a_readl(g, pwr_falcon_dmactl_r()) &
(pwr_falcon_dmactl_dmem_scrubbing_m() |
pwr_falcon_dmactl_imem_scrubbing_m());
if (!w) {
gk20a_dbg_fn("done");
break;
}
nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) {
err = -ETIMEDOUT; err = -ETIMEDOUT;
goto out; goto out;
} }
@@ -187,25 +170,8 @@ static int gm206_bios_preos(struct gk20a *g)
struct nvgpu_timeout timeout; struct nvgpu_timeout timeout;
gk20a_dbg_fn(""); gk20a_dbg_fn("");
nvgpu_flcn_reset(g->pmu.flcn);
nvgpu_timeout_init(g, &timeout, if (nvgpu_flcn_reset(g->pmu.flcn)) {
PMU_BOOT_TIMEOUT_MAX /
PMU_BOOT_TIMEOUT_DEFAULT,
NVGPU_TIMER_RETRY_TIMER);
do {
u32 w = gk20a_readl(g, pwr_falcon_dmactl_r()) &
(pwr_falcon_dmactl_dmem_scrubbing_m() |
pwr_falcon_dmactl_imem_scrubbing_m());
if (!w) {
gk20a_dbg_fn("done");
break;
}
nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) {
err = -ETIMEDOUT; err = -ETIMEDOUT;
goto out; goto out;
} }