diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-07-01 18:39:15 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-07-03 22:00:22 -0400 |
commit | 417bc8361a6e39ca70ce4f84368d9b41c4e12de1 (patch) | |
tree | 165a7336a4c22e88c282c09ccbfb480d274a192a /drivers/gpu | |
parent | 63714e7cc158d0574947c2171a81988ffece2a2a (diff) |
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/765366
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fb_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fb_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fb_gm20b.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index 35551939..2966e654 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "hw_mc_gk20a.h" | 20 | #include "hw_mc_gk20a.h" |
21 | #include "hw_fb_gk20a.h" | 21 | #include "hw_fb_gk20a.h" |
22 | 22 | ||
23 | static void fb_gk20a_reset(struct gk20a *g) | 23 | void fb_gk20a_reset(struct gk20a *g) |
24 | { | 24 | { |
25 | u32 val; | 25 | u32 val; |
26 | 26 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h b/drivers/gpu/nvgpu/gk20a/fb_gk20a.h index 49dd5fd7..e5ea9e42 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.h | |||
@@ -16,4 +16,5 @@ | |||
16 | struct gk20a; | 16 | struct gk20a; |
17 | 17 | ||
18 | void gk20a_init_fb(struct gpu_ops *gops); | 18 | void gk20a_init_fb(struct gpu_ops *gops); |
19 | void fb_gk20a_reset(struct gk20a *g); | ||
19 | #endif | 20 | #endif |
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c index 746ed42f..3d4604c5 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |||
@@ -17,6 +17,7 @@ | |||
17 | 17 | ||
18 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/kind_gk20a.h" | 19 | #include "gk20a/kind_gk20a.h" |
20 | #include "gk20a/fb_gk20a.h" | ||
20 | 21 | ||
21 | #include "hw_fb_gm20b.h" | 22 | #include "hw_fb_gm20b.h" |
22 | #include "hw_top_gm20b.h" | 23 | #include "hw_top_gm20b.h" |
@@ -131,6 +132,7 @@ static void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g) | |||
131 | 132 | ||
132 | void gm20b_init_fb(struct gpu_ops *gops) | 133 | void gm20b_init_fb(struct gpu_ops *gops) |
133 | { | 134 | { |
135 | gops->fb.reset = fb_gk20a_reset; | ||
134 | gops->fb.init_fs_state = fb_gm20b_init_fs_state; | 136 | gops->fb.init_fs_state = fb_gm20b_init_fs_state; |
135 | gops->fb.set_mmu_page_size = gm20b_fb_set_mmu_page_size; | 137 | gops->fb.set_mmu_page_size = gm20b_fb_set_mmu_page_size; |
136 | gops->fb.compression_page_size = gm20b_fb_compression_page_size; | 138 | gops->fb.compression_page_size = gm20b_fb_compression_page_size; |