diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-09-26 17:02:11 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-10-20 01:10:37 -0400 |
commit | 174e6ad1b22cb7aab1bd250679231e4dec568a65 (patch) | |
tree | 2656f137fb33661506159d74bdc1c347b6e5c801 /drivers/gpu/nvgpu/gk20a | |
parent | db6e115d1728bd2471359fe18392b8edbf954d30 (diff) |
gpu: nvgpu: VBIOS version check
Add a minimum VBIOS version field for each SKU. This requires the
gk20a_platform structure to be per SKU.
Also sets power_on back to false if there was any error in booting
GPU.
Bug 1811880
Change-Id: I23ef312f0db7061b31a3d503ded7e41ef45ad6b3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1227229
(cherry picked from commit 69c9ab4349ec7526a7f8a2fcad01f9128ed4769c)
Reviewed-on: http://git-master/r/1239428
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 9eebfe88..55ebf2da 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1059,6 +1059,9 @@ int gk20a_pm_finalize_poweron(struct device *dev) | |||
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | done: | 1061 | done: |
1062 | if (err) | ||
1063 | g->power_on = false; | ||
1064 | |||
1062 | return err; | 1065 | return err; |
1063 | } | 1066 | } |
1064 | 1067 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 6afd4852..de7bbd06 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -225,6 +225,8 @@ struct gk20a_platform { | |||
225 | /* if vidmem aperture actually points to vidmem*/ | 225 | /* if vidmem aperture actually points to vidmem*/ |
226 | bool vidmem_is_vidmem; | 226 | bool vidmem_is_vidmem; |
227 | 227 | ||
228 | /* minimum supported VBIOS version */ | ||
229 | u32 vbios_min_version; | ||
228 | }; | 230 | }; |
229 | 231 | ||
230 | static inline struct gk20a_platform *gk20a_get_platform( | 232 | static inline struct gk20a_platform *gk20a_get_platform( |