diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2014-06-05 17:15:58 +0530 |
---|---|---|
committer | Riham Haidar <rhaidar@nvidia.com> | 2014-06-12 17:33:49 -0700 |
commit | 391d9bacf053fe0dacffc76c36768f82912ad1f4 (patch) | |
tree | eb721c51f3c025c5f834cee62de81eb9bb5cec62 /drivers/gpu | |
parent | bc5d590d5b66ace63e85c2616eef558183454756 (diff) |
gpu: nvgpu: remove unused vpr refetch functions
VPR resize is done by forcing GPU to idle and then updating
VPR size from TLK.
There is no need now to call vpr_resize funtion from kernel
and hence these functions can be removed.
Bug 1487804
Change-Id: I758a6e0a99a58757866f1138b0a89594e2a33908
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/421703
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 45 |
2 files changed, 0 insertions, 59 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 42b13c69c639..ad6f9b63a04c 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -1707,20 +1707,6 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) return 0; } -int nvhost_vpr_info_fetch(void) -{ - struct gk20a *g = get_gk20a(to_platform_device( - bus_find_device_by_name(&platform_bus_type, - NULL, "gk20a.0"))); - - if (!g) { - pr_info("gk20a ins't ready yet\n"); - return 0; - } - - return gk20a_mm_mmu_vpr_info_fetch(g); -} - static const struct firmware * do_request_firmware(struct device *dev, const char *prefix, const char *fw_name) { diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index d2174f37f810..248b2e96fc72 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -3010,48 +3010,3 @@ bool gk20a_mm_mmu_debug_mode_enabled(struct gk20a *g) return fb_mmu_debug_ctrl_debug_v(debug_ctrl) == fb_mmu_debug_ctrl_debug_enabled_v(); } - -static int gk20a_mm_mmu_vpr_info_fetch_wait(struct gk20a *g, - const unsigned int msec) -{ - unsigned long timeout; - - timeout = jiffies + msecs_to_jiffies(msec); - while (1) { - u32 val; - - val = gk20a_readl(g, fb_mmu_vpr_info_r()); - if (fb_mmu_vpr_info_fetch_v(val) == - fb_mmu_vpr_info_fetch_false_v()) - break; - - if (tegra_platform_is_silicon() && - WARN_ON(time_after(jiffies, timeout))) - return -ETIME; - } - - return 0; -} - -int gk20a_mm_mmu_vpr_info_fetch(struct gk20a *g) -{ - int ret = 0; - - gk20a_busy_noresume(g->dev); - if (!pm_runtime_active(&g->dev->dev)) - goto fail; - - if (gk20a_mm_mmu_vpr_info_fetch_wait(g, 5)) { - ret = -ETIME; - goto fail; - } - - gk20a_writel(g, fb_mmu_vpr_info_r(), - fb_mmu_vpr_info_fetch_true_v()); - - ret = gk20a_mm_mmu_vpr_info_fetch_wait(g, 5); - - fail: - gk20a_idle(g->dev); - return ret; -} |