summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/fb
diff options
context:
space:
mode:
authorVinod G <vinodg@nvidia.com>2019-02-06 19:23:11 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2020-01-08 11:35:39 -0500
commit7a26ad57a7d2fc5cec4a0c8a8395c0c666d31cba (patch)
tree4ec371f30086045414e785199052394a4a9bd739 /drivers/gpu/nvgpu/common/fb
parentdacb06f4647b924aa6455e8156b74df5098cf3bf (diff)
gpu: nvgpu: enable platform atomic feature
Support following changes related to platform atomic feature NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_MODE to RMW MODE NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_SYS_NCOH_MODE to L2 NV_PFB_HSHUB_NUM_ACTIVE_LTCS_HUB_SYS_ATOMIC_MODE to USE_RMW NV_PFB_FBHUB_NUM_ACTIVE_LTCS_HUB_SYS_ATOMIC_MODE to USE_RMW NV_PFB_FBHUB_NUM_ACTIVE_LTCS_HUB_SYS_NCOH_ATOMIC_MODE to USE_READ In gv11b, FBHUB_NUM_ACTIVE_LTCS register has read only privilege, so atomic mode register bits cannot be updated from kernel code. atomic capability and atomic_sys_ncoh_mode bits are copied from fb mmu_ctrl to gpcs_mmu_ctrl register. new tu104 hal for fb_enable_nvlink function. bug 200580236 Change-Id: Ia78986c1c56795c6efad20f4ba42700ef1c2c1ad Signed-off-by: Vinod G <vinodg@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2013481 (cherry picked from commit 251e3eaa8029c4ae07b2cde7af5d9775e1cd8ec1) Signed-off-by: Lakshmanan M <lm@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2274932 GVS: Gerrit_Virtual_Submit Tested-by: Sreeniketh H <sh@nvidia.com> Reviewed-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/fb')
-rw-r--r--drivers/gpu/nvgpu/common/fb/fb_gv11b.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index b98d1c41..49e8f385 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11B FB 2 * GV11B FB
3 * 3 *
4 * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a 6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"), 7 * copy of this software and associated documentation files (the "Software"),
@@ -62,6 +62,34 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
62 } 62 }
63} 63}
64 64
65static void gv11b_fb_set_atomic_mode(struct gk20a *g)
66{
67 u32 reg_val;
68
69 /*
70 * NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_MODE to RMW MODE
71 * NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_SYS_NCOH_MODE to L2
72 */
73 reg_val = nvgpu_readl(g, fb_mmu_ctrl_r());
74 reg_val = set_field(reg_val, fb_mmu_ctrl_atomic_capability_mode_m(),
75 fb_mmu_ctrl_atomic_capability_mode_rmw_f());
76 reg_val = set_field(reg_val, fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_m(),
77 fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_l2_f());
78 nvgpu_writel(g, fb_mmu_ctrl_r(), reg_val);
79
80 /* NV_PFB_HSHUB_NUM_ACTIVE_LTCS_HUB_SYS_ATOMIC_MODE to USE_RMW */
81 reg_val = nvgpu_readl(g, fb_hshub_num_active_ltcs_r());
82 reg_val = set_field(reg_val, fb_hshub_num_active_ltcs_hub_sys_atomic_mode_m(),
83 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_use_rmw_f());
84 nvgpu_writel(g, fb_hshub_num_active_ltcs_r(), reg_val);
85
86 nvgpu_log(g, gpu_dbg_info, "fb_mmu_ctrl_r 0x%x",
87 gk20a_readl(g, fb_mmu_ctrl_r()));
88
89 nvgpu_log(g, gpu_dbg_info, "fb_hshub_num_active_ltcs_r 0x%x",
90 gk20a_readl(g, fb_hshub_num_active_ltcs_r()));
91}
92
65void gv11b_fb_init_hw(struct gk20a *g) 93void gv11b_fb_init_hw(struct gk20a *g)
66{ 94{
67 gm20b_fb_init_hw(g); 95 gm20b_fb_init_hw(g);
@@ -75,6 +103,8 @@ void gv11b_fb_init_fs_state(struct gk20a *g)
75 103
76 gv11b_init_nvlink_soc_credits(g); 104 gv11b_init_nvlink_soc_credits(g);
77 105
106 gv11b_fb_set_atomic_mode(g);
107
78 nvgpu_log(g, gpu_dbg_info, "fbhub active ltcs %x", 108 nvgpu_log(g, gpu_dbg_info, "fbhub active ltcs %x",
79 gk20a_readl(g, fb_fbhub_num_active_ltcs_r())); 109 gk20a_readl(g, fb_fbhub_num_active_ltcs_r()));
80 110