diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index de7bbd06..c0b847e5 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -227,6 +227,9 @@ struct gk20a_platform { | |||
227 | 227 | ||
228 | /* minimum supported VBIOS version */ | 228 | /* minimum supported VBIOS version */ |
229 | u32 vbios_min_version; | 229 | u32 vbios_min_version; |
230 | |||
231 | /* true if we run preos microcode on this board */ | ||
232 | bool run_preos; | ||
230 | }; | 233 | }; |
231 | 234 | ||
232 | static inline struct gk20a_platform *gk20a_get_platform( | 235 | static inline struct gk20a_platform *gk20a_get_platform( |
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index aa40f410..2f1a32d3 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c | |||
@@ -918,10 +918,12 @@ static int gm206_bios_init(struct gk20a *g) | |||
918 | return err; | 918 | return err; |
919 | } | 919 | } |
920 | 920 | ||
921 | err = gm206_bios_preos(g); | 921 | if (platform->run_preos) { |
922 | if (err) { | 922 | err = gm206_bios_preos(g); |
923 | gk20a_err(g->dev, "pre-os failed"); | 923 | if (err) { |
924 | return err; | 924 | gk20a_err(g->dev, "pre-os failed"); |
925 | return err; | ||
926 | } | ||
925 | } | 927 | } |
926 | 928 | ||
927 | return 0; | 929 | return 0; |