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: gm206: Use new delay APIs

Browse Source 
Use platform agnostic delay functions instead of Linux kernel APIs.
This allows removing dependency to Linux header linux/delay.h. At the
same time remove #include lines for other unused Linux headers.

JIRA NVGPU-16

Change-Id: I4099070fecde3f55ee1c99ee1b991e67742e2629
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460115
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Terje Bergstrom
2017-04-10 13:55:04 -07:00
committed by mobile promotions
parent 947a236063
commit a32ec94eb4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,6 @@
* more details. * more details.
*/ */
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/pci.h> #include <linux/pci.h>
@@ -118,7 +116,7 @@ static int gm206_bios_devinit(struct gk20a *g)
gk20a_dbg_fn("done"); gk20a_dbg_fn("done");
break; break;
} }
udelay(PMU_BOOT_TIMEOUT_DEFAULT); nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!nvgpu_timeout_expired(&timeout)); } while (!nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) { if (nvgpu_timeout_peek_expired(&timeout)) {
@@ -161,7 +159,7 @@ static int gm206_bios_devinit(struct gk20a *g)
gk20a_readl(g, pwr_falcon_cpuctl_r())) && gk20a_readl(g, pwr_falcon_cpuctl_r())) &&
top_scratch1_devinit_completed_v( top_scratch1_devinit_completed_v(
gk20a_readl(g, top_scratch1_r())); gk20a_readl(g, top_scratch1_r()));
udelay(PMU_BOOT_TIMEOUT_DEFAULT); nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!devinit_completed && !nvgpu_timeout_expired(&timeout)); } while (!devinit_completed && !nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) if (nvgpu_timeout_peek_expired(&timeout))
@@ -196,7 +194,7 @@ static int gm206_bios_preos(struct gk20a *g)
gk20a_dbg_fn("done"); gk20a_dbg_fn("done");
break; break;
} }
udelay(PMU_BOOT_TIMEOUT_DEFAULT); nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!nvgpu_timeout_expired(&timeout)); } while (!nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) { if (nvgpu_timeout_peek_expired(&timeout)) {
@@ -229,7 +227,7 @@ static int gm206_bios_preos(struct gk20a *g)
do { do {
val = pwr_falcon_cpuctl_halt_intr_v( val = pwr_falcon_cpuctl_halt_intr_v(
gk20a_readl(g, pwr_falcon_cpuctl_r())); gk20a_readl(g, pwr_falcon_cpuctl_r()));
udelay(PMU_BOOT_TIMEOUT_DEFAULT); nvgpu_udelay(PMU_BOOT_TIMEOUT_DEFAULT);
} while (!val && !nvgpu_timeout_expired(&timeout)); } while (!val && !nvgpu_timeout_expired(&timeout));
if (nvgpu_timeout_peek_expired(&timeout)) { if (nvgpu_timeout_peek_expired(&timeout)) {