diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-29 18:53:24 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-12-08 18:53:35 -0500 |
commit | 5121bd4b6f2a41b3db045cca7246f9b1832c8648 (patch) | |
tree | 68183487f09347b6827e1ae4fa3887ff730d9303 /drivers/gpu/nvgpu/common | |
parent | ee0bc391e047bc11611323fb4d30d0be4389be6b (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c | 4 |
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 @@ | |||
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <uapi/linux/nvgpu.h> | 19 | #include <uapi/linux/nvgpu.h> |
20 | 20 | ||
21 | #include <nvgpu/defaults.h> | ||
21 | #include <nvgpu/kmem.h> | 22 | #include <nvgpu/kmem.h> |
22 | #include <nvgpu/nvgpu_common.h> | 23 | #include <nvgpu/nvgpu_common.h> |
23 | #include <nvgpu/soc.h> | 24 | #include <nvgpu/soc.h> |
@@ -88,7 +89,7 @@ static void nvgpu_init_timeout(struct gk20a *g) | |||
88 | { | 89 | { |
89 | struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g)); | 90 | struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g)); |
90 | 91 | ||
91 | g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; | 92 | g->gr_idle_timeout_default = NVGPU_DEFAULT_GR_IDLE_TIMEOUT; |
92 | if (nvgpu_platform_is_silicon(g)) | 93 | if (nvgpu_platform_is_silicon(g)) |
93 | g->timeouts_enabled = true; | 94 | g->timeouts_enabled = true; |
94 | else if (nvgpu_platform_is_fpga(g)) { | 95 | 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 @@ | |||
31 | #include <nvgpu/bus.h> | 31 | #include <nvgpu/bus.h> |
32 | #include <nvgpu/soc.h> | 32 | #include <nvgpu/soc.h> |
33 | #include <nvgpu/ctxsw_trace.h> | 33 | #include <nvgpu/ctxsw_trace.h> |
34 | #include <nvgpu/defaults.h> | ||
34 | 35 | ||
35 | #include "vgpu.h" | 36 | #include "vgpu.h" |
36 | #include "fecs_trace_vgpu.h" | 37 | #include "fecs_trace_vgpu.h" |
@@ -750,8 +751,7 @@ int vgpu_probe(struct platform_device *pdev) | |||
750 | dev->dma_parms = &l->dma_parms; | 751 | dev->dma_parms = &l->dma_parms; |
751 | dma_set_max_seg_size(dev, UINT_MAX); | 752 | dma_set_max_seg_size(dev, UINT_MAX); |
752 | 753 | ||
753 | gk20a->gr_idle_timeout_default = | 754 | gk20a->gr_idle_timeout_default = NVGPU_DEFAULT_GR_IDLE_TIMEOUT; |
754 | CONFIG_GK20A_DEFAULT_TIMEOUT; | ||
755 | gk20a->timeouts_enabled = true; | 755 | gk20a->timeouts_enabled = true; |
756 | 756 | ||
757 | vgpu_create_sysfs(dev); | 757 | vgpu_create_sysfs(dev); |