diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-02 03:13:06 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:46 -0400 |
| commit | 596aa6e592eef797770575833811303d5a5a65dd (patch) | |
| tree | ec39673ceafb1829f61060929e3d9920e07d01d4 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
| parent | 80befeeb8342d75565ac6b53acd5a0e4a6bb6320 (diff) | |
gpu: nvgpu: Disable timeout if not on silicon
Change-Id: I0add505d4f5c4b136f9f0228adbdc9aba960fcba
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/404276
Reviewed-by: Antoine Chauveau <achauveau@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 864d6229..a78e1e5d 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
| @@ -1422,7 +1422,8 @@ static int gk20a_probe(struct platform_device *dev) | |||
| 1422 | 1422 | ||
| 1423 | gk20a->gr_idle_timeout_default = | 1423 | gk20a->gr_idle_timeout_default = |
| 1424 | CONFIG_GK20A_DEFAULT_TIMEOUT; | 1424 | CONFIG_GK20A_DEFAULT_TIMEOUT; |
| 1425 | gk20a->timeouts_enabled = true; | 1425 | if (tegra_platform_is_silicon()) |
| 1426 | gk20a->timeouts_enabled = true; | ||
| 1426 | 1427 | ||
| 1427 | /* Set up initial clock gating settings */ | 1428 | /* Set up initial clock gating settings */ |
| 1428 | if (tegra_platform_is_silicon()) { | 1429 | if (tegra_platform_is_silicon()) { |