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: Don't ioremap() regs when using POSIX

Browse Source 
When __NVGPU_POSIX__ is defined do no use ioremap(). This operation
probably doesn't make much sense. Currently we have no plans to run
the driver in userspace against a real GPU, hence programming the
nvlink credits registers is simply not necessary.

Also fix an unused variable by returing it as an error.

JIRA NVGPU-525

Change-Id: Ic94d332551f6e25c1836331bf92188e7651546cb
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1673815
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2018-02-21 15:56:40 -08:00
committed by mobile promotions
parent eb54945f18
commit 22a95f15e0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/gv11b/fb_gv11b.c
View File

@@ -56,6 +56,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
if (nvgpu_is_bpmp_running(g) && (!nvgpu_platform_is_simulation(g))) { if (nvgpu_is_bpmp_running(g) && (!nvgpu_platform_is_simulation(g))) {
nvgpu_log(g, gpu_dbg_info, "nvlink soc credits init done by bpmp"); nvgpu_log(g, gpu_dbg_info, "nvlink soc credits init done by bpmp");
} else { } else {
#ifndef __NVGPU_POSIX__
/* MSS_NVLINK_1_BASE */ /* MSS_NVLINK_1_BASE */
void __iomem *soc1 = ioremap(0x01f20010, 4096); void __iomem *soc1 = ioremap(0x01f20010, 4096);
/* MSS_NVLINK_2_BASE */ /* MSS_NVLINK_2_BASE */
@@ -87,6 +88,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
writel_relaxed(val, soc4); writel_relaxed(val, soc4);
val = readl_relaxed(soc4 + 4); val = readl_relaxed(soc4 + 4);
writel_relaxed(val, soc4 + 4); writel_relaxed(val, soc4 + 4);
#endif
} }
} }
@@ -996,7 +998,7 @@ static void gv11b_fb_handle_mmu_fault_common(struct gk20a *g,
} }
} }
static void gv11b_fb_replay_or_cancel_faults(struct gk20a *g, static int gv11b_fb_replay_or_cancel_faults(struct gk20a *g,
u32 invalidate_replay_val) u32 invalidate_replay_val)
{ {
int err = 0; int err = 0;
@@ -1017,6 +1019,8 @@ static void gv11b_fb_replay_or_cancel_faults(struct gk20a *g,
err = gv11b_fb_mmu_invalidate_replay(g, err = gv11b_fb_mmu_invalidate_replay(g,
fb_mmu_invalidate_replay_start_ack_all_f()); fb_mmu_invalidate_replay_start_ack_all_f());
} }
return err;
} }
static void gv11b_fb_handle_mmu_nonreplay_replay_fault(struct gk20a *g, static void gv11b_fb_handle_mmu_nonreplay_replay_fault(struct gk20a *g,