gpu: nvgpu: Simplify pagepool size query

Make pagepool size query into a function instead of storing the value
during boot time in a structure. This simplifies the structure and
users of pagepool size do not need to worry about whether it has
already been set.

Change-Id: Iba16e840cdf9b6c39449730237aa7d8fdff47848
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/660907

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 44fa6189..66b94943 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -770,12 +770,9 @@ static void gr_gm20b_detect_sm_arch(struct gk20a *g)
                 gr_gpc0_tpc0_sm_arch_warp_count_v(v);
 }
 
-static void gr_gm20b_buffer_size_defaults(struct gk20a *g)
+static u32 gr_gm20b_pagepool_default_size(struct gk20a *g)
 {
-        g->gr.pagepool_default_size =
-                gr_scc_pagepool_total_pages_hwmax_value_v();
-        g->gr.pagepool_max_size =
-                gr_scc_pagepool_total_pages_hwmax_value_v();
+        return gr_scc_pagepool_total_pages_hwmax_value_v();
 }
 
 void gm20b_init_gr(struct gpu_ops *gops)
@@ -815,5 +812,5 @@ void gm20b_init_gr(struct gpu_ops *gops)
         gops->gr.detect_sm_arch = gr_gm20b_detect_sm_arch;
         gops->gr.add_zbc_color = gr_gk20a_add_zbc_color;
         gops->gr.add_zbc_depth = gr_gk20a_add_zbc_depth;
-        gops->gr.buffer_size_defaults = gr_gm20b_buffer_size_defaults;
+        gops->gr.pagepool_default_size = gr_gm20b_pagepool_default_size;
 }