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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/378325

diff --git a/drivers/video/tegra/host/gk20a/fb_gk20a.c b/drivers/video/tegra/host/gk20a/fb_gk20a.c
index e4a5b115570e7fa7d40fbfb8148b61633af3aa4b..6bdfc0f31b07e7ffa696f32cc2eabcf8fb42af86 100644 (file)
--- a/drivers/video/tegra/host/gk20a/fb_gk20a.c
+++ b/drivers/video/tegra/host/gk20a/fb_gk20a.c
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #include <dev.h>
 #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 df0f8c7bcfc05a666247270a608127db1629b4c2..bdf66192970a18ffaed0b051994eaa0ddcc6825c 100644 (file)
--- 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 7a5759928eebf7ac2371fcf7b5f695ee752475fa..7d1977298463ee561b547e64a6c37e3557f01449 100644 (file)
--- 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;