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/gm206/bios_gm206.c | |
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/gm206/bios_gm206.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index ea65e392..aa40f410 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c | |||
@@ -894,6 +894,14 @@ static int gm206_bios_init(struct gk20a *g) | |||
894 | gk20a_err(g->dev, "no valid VBIOS found"); | 894 | gk20a_err(g->dev, "no valid VBIOS found"); |
895 | return -EINVAL; | 895 | return -EINVAL; |
896 | } | 896 | } |
897 | |||
898 | if (g->gpu_characteristics.vbios_version < | ||
899 | platform->vbios_min_version) { | ||
900 | gk20a_err(g->dev, "unsupported VBIOS version %08x", | ||
901 | g->gpu_characteristics.vbios_version); | ||
902 | return -EINVAL; | ||
903 | } | ||
904 | |||
897 | g->bios_blob.data = g->bios.data; | 905 | g->bios_blob.data = g->bios.data; |
898 | g->bios_blob.size = g->bios.size; | 906 | g->bios_blob.size = g->bios.size; |
899 | 907 | ||