summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorSeema Khowala <seemaj@nvidia.com>2017-04-07 16:57:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-16 19:45:49 -0400
commitc8821f49ba6a37fc75e0772342fba9f57f99bb99 (patch)
tree2d8b4a19c4d584f1c4c45c7e9113a0856836ba99 /drivers/gpu/nvgpu/common
parent1d95b96652c48a85a59daca9ab05397ded785a66 (diff)
gpu: nvgpu: fpga: set gr_idle_timeout_default
set gr_idle_timeout_default to 100000 ms instead of MAX_SCHEDULE_TIMEOUT, and enable timeouts_enabled Change-Id: I0b4d014dc6f3fc3c365214f7ffad7af054f771b9 Signed-off-by: Seema Khowala <seemaj@nvidia.com> Reviewed-on: http://git-master/r/1458178 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/soc.c5
-rw-r--r--drivers/gpu/nvgpu/common/nvgpu_common.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/soc.c b/drivers/gpu/nvgpu/common/linux/soc.c
index d2bb5275..f0cbc3e7 100644
--- a/drivers/gpu/nvgpu/common/linux/soc.c
+++ b/drivers/gpu/nvgpu/common/linux/soc.c
@@ -25,6 +25,11 @@ bool nvgpu_platform_is_simulation(struct gk20a *g)
25 return tegra_platform_is_linsim() || tegra_platform_is_vdk(); 25 return tegra_platform_is_linsim() || tegra_platform_is_vdk();
26} 26}
27 27
28bool nvgpu_platform_is_fpga(struct gk20a *g)
29{
30 return tegra_platform_is_fpga();
31}
32
28bool nvgpu_is_hypervisor_mode(struct gk20a *g) 33bool nvgpu_is_hypervisor_mode(struct gk20a *g)
29{ 34{
30 return is_tegra_hypervisor_mode(); 35 return is_tegra_hypervisor_mode();
diff --git a/drivers/gpu/nvgpu/common/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c
index a78da93d..0c812d34 100644
--- a/drivers/gpu/nvgpu/common/nvgpu_common.c
+++ b/drivers/gpu/nvgpu/common/nvgpu_common.c
@@ -24,6 +24,7 @@
24 24
25#include "gk20a/gk20a_scale.h" 25#include "gk20a/gk20a_scale.h"
26#include "gk20a/gk20a.h" 26#include "gk20a/gk20a.h"
27#include "gk20a/gr_gk20a.h"
27 28
28#define EMC3D_DEFAULT_RATIO 750 29#define EMC3D_DEFAULT_RATIO 750
29 30
@@ -64,6 +65,10 @@ static void nvgpu_init_timeout(struct gk20a *g)
64 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; 65 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT;
65 if (nvgpu_platform_is_silicon(g)) 66 if (nvgpu_platform_is_silicon(g))
66 g->timeouts_enabled = true; 67 g->timeouts_enabled = true;
68 else if (nvgpu_platform_is_fpga(g)) {
69 g->gr_idle_timeout_default = GK20A_TIMEOUT_FPGA;
70 g->timeouts_enabled = true;
71 }
67} 72}
68 73
69static void nvgpu_init_timeslice(struct gk20a *g) 74static void nvgpu_init_timeslice(struct gk20a *g)