From af8ff60bcc47e0e7e97fc2a39fdee68f3340d23b Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Mar 2014 08:22:12 +0200 Subject: video: tegra: host: gk20a: Init kind in fb init Init kind tables in gk20a specific fb init. Change-Id: Ib7642aba74c924b69aa8c0038315c65d30c57883 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/378325 --- drivers/video/tegra/host/gk20a/fb_gk20a.c | 3 +++ drivers/video/tegra/host/gk20a/gk20a.h | 3 +++ drivers/video/tegra/host/gk20a/mm_gk20a.c | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/video/tegra/host/gk20a/fb_gk20a.c b/drivers/video/tegra/host/gk20a/fb_gk20a.c index e4a5b115570e..6bdfc0f31b07 100644 --- a/drivers/video/tegra/host/gk20a/fb_gk20a.c +++ b/drivers/video/tegra/host/gk20a/fb_gk20a.c @@ -16,6 +16,7 @@ #include #include #include "gk20a/gk20a.h" +#include "kind_gk20a.h" #include "hw_mc_gk20a.h" static void fb_gk20a_reset(struct gk20a *g) @@ -31,4 +32,6 @@ static void fb_gk20a_reset(struct gk20a *g) void gk20a_init_fb(struct gpu_ops *gops) { gops->fb.reset = fb_gk20a_reset; + gk20a_init_uncompressed_kind_map(); + gk20a_init_kind_attr(); } diff --git a/drivers/video/tegra/host/gk20a/gk20a.h b/drivers/video/tegra/host/gk20a/gk20a.h index df0f8c7bcfc0..bdf66192970a 100644 --- a/drivers/video/tegra/host/gk20a/gk20a.h +++ b/drivers/video/tegra/host/gk20a/gk20a.h @@ -115,7 +115,10 @@ struct gpu_ops { } gr; const char *name; struct { + void (*init_fs_state)(struct gk20a *g); void (*reset)(struct gk20a *g); + void (*init_uncompressed_kind_map)(struct gk20a *g); + void (*init_kind_attr)(struct gk20a *g); } fb; }; diff --git a/drivers/video/tegra/host/gk20a/mm_gk20a.c b/drivers/video/tegra/host/gk20a/mm_gk20a.c index 7a5759928eeb..7d1977298463 100644 --- a/drivers/video/tegra/host/gk20a/mm_gk20a.c +++ b/drivers/video/tegra/host/gk20a/mm_gk20a.c @@ -262,6 +262,9 @@ static int gk20a_init_mm_reset_enable_hw(struct gk20a *g) if (g->ops.fb.reset) g->ops.fb.reset(g); + if (g->ops.fb.init_fs_state) + g->ops.fb.init_fs_state(g); + return 0; } @@ -341,9 +344,6 @@ int gk20a_init_mm_setup_sw(struct gk20a *g) gk20a_init_bar1_vm(mm); - gk20a_init_uncompressed_kind_map(); - gk20a_init_kind_attr(); - mm->remove_support = gk20a_remove_mm_support; mm->sw_ready = true; -- cgit v1.2.3