gpu: nvgpu: Reset FB also in gm20b

FB reset was added for gk20a. It should be invoked also on gm20b.

Change-Id: I0b074bc50a889108edae93d62b3194e54bfda881
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/765059
Reviewed-by: Cory Perry <cperry@nvidia.com>
Tested-by: Cory Perry <cperry@nvidia.com>

diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
index 355519394c305eb51bac100e51bb2f6d866dc586..2966e654abb6ac12e8ee77fb887e2fce58897b32 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
@@ -20,7 +20,7 @@
 #include "hw_mc_gk20a.h"
 #include "hw_fb_gk20a.h"
 
-static void fb_gk20a_reset(struct gk20a *g)
+void fb_gk20a_reset(struct gk20a *g)
 {
        u32 val;
 

diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h b/drivers/gpu/nvgpu/gk20a/fb_gk20a.h
index 49dd5fd7a10e1450ee4582c2e657e5d7ff07c228..e5ea9e42134594778a0ab1e45b67644d8dc1768e 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.h
@@ -16,4 +16,5 @@
 struct gk20a;
 
 void gk20a_init_fb(struct gpu_ops *gops);
+void fb_gk20a_reset(struct gk20a *g);
 #endif

diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
index 746ed42fa16abc62c1648096acb0a8a74ed07eb4..3d4604c5bc6418e7d2044b0a66d0b4eb8569e79b 100644 (file)
--- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
@@ -17,6 +17,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/kind_gk20a.h"
+#include "gk20a/fb_gk20a.h"
 
 #include "hw_fb_gm20b.h"
 #include "hw_top_gm20b.h"
@@ -131,6 +132,7 @@ static void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g)
 
 void gm20b_init_fb(struct gpu_ops *gops)
 {
+       gops->fb.reset = fb_gk20a_reset;
        gops->fb.init_fs_state = fb_gm20b_init_fs_state;
        gops->fb.set_mmu_page_size = gm20b_fb_set_mmu_page_size;
        gops->fb.compression_page_size = gm20b_fb_compression_page_size;