diff options
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( |