From c3b5b48c0fbecfb874d0fa4aa52286849bb36a5b Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 20 Jun 2018 17:27:02 -0700 Subject: gpu: nvgpu: move slices_per_ltc & cacheline_size init to floorsweeping It was initialized at .init_comptags, but we may also need them without comptags. Jira NVGPUT-63 Change-Id: Ie818c3ecf890fc84323b9662a32d666a6d2b3936 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1756373 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/ltc_vgpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/ltc_vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c index f68c8454..873ddd24 100644 --- a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c @@ -44,9 +44,7 @@ int vgpu_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) nvgpu_log_fn(g, " "); - gr->cacheline_size = priv->constants.cacheline_size; gr->comptags_per_cacheline = priv->constants.comptags_per_cacheline; - gr->slices_per_ltc = priv->constants.slices_per_ltc; max_comptag_lines = priv->constants.comptag_lines; if (max_comptag_lines < 2) @@ -64,8 +62,11 @@ int vgpu_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) void vgpu_ltc_init_fs_state(struct gk20a *g) { struct vgpu_priv_data *priv = vgpu_get_priv_data(g); + struct gr_gk20a *gr = &g->gr; nvgpu_log_fn(g, " "); g->ltc_count = priv->constants.ltc_count; + gr->cacheline_size = priv->constants.cacheline_size; + gr->slices_per_ltc = priv->constants.slices_per_ltc; } -- cgit v1.2.2