gpu: nvpgu: Move GR IDLE timeout definition to header

GR IDLE timeout is defined as Kconfig. Instead of that introduce a
new header file defaults.h which encapsulates any generic defaults
we use in nvgpu, and move the definition there.

Change-Id: I78ff1d2790d7ee3dff6df42bbd11cf683a85bf79
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1612650
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 425198d5..51ae18a3 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -18,6 +18,7 @@
 #include <linux/mm.h>
 #include <uapi/linux/nvgpu.h>
 
+#include <nvgpu/defaults.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/soc.h>
@@ -88,7 +89,7 @@ static void nvgpu_init_timeout(struct gk20a *g)
 {
         struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
 
-        g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT;
+        g->gr_idle_timeout_default = NVGPU_DEFAULT_GR_IDLE_TIMEOUT;
         if (nvgpu_platform_is_silicon(g))
                 g->timeouts_enabled = true;
         else if (nvgpu_platform_is_fpga(g)) {
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c
index f6c13db1..1ec0bc1c 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c
@@ -31,6 +31,7 @@
 #include <nvgpu/bus.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/ctxsw_trace.h>
+#include <nvgpu/defaults.h>
 
 #include "vgpu.h"
 #include "fecs_trace_vgpu.h"
@@ -750,8 +751,7 @@ int vgpu_probe(struct platform_device *pdev)
         dev->dma_parms = &l->dma_parms;
         dma_set_max_seg_size(dev, UINT_MAX);
 
-        gk20a->gr_idle_timeout_default =
-                        CONFIG_GK20A_DEFAULT_TIMEOUT;
+        gk20a->gr_idle_timeout_default = NVGPU_DEFAULT_GR_IDLE_TIMEOUT;
         gk20a->timeouts_enabled = true;
 
         vgpu_create_sysfs(dev);