summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b
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/gv11b
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/gv11b')
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_gv11b.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 9506db3a..1dfecfc1 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11b GPU GR 2 * GV11b GPU GR
3 * 3 *
4 * Copyright (c) 2016-2019, 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"),
@@ -4297,7 +4297,9 @@ void gr_gv11b_init_gpc_mmu(struct gk20a *g)
4297 gr_gpcs_pri_mmu_ctrl_cache_mode_m() | 4297 gr_gpcs_pri_mmu_ctrl_cache_mode_m() |
4298 gr_gpcs_pri_mmu_ctrl_mmu_aperture_m() | 4298 gr_gpcs_pri_mmu_ctrl_mmu_aperture_m() |
4299 gr_gpcs_pri_mmu_ctrl_mmu_vol_m() | 4299 gr_gpcs_pri_mmu_ctrl_mmu_vol_m() |
4300 gr_gpcs_pri_mmu_ctrl_mmu_disable_m(); 4300 gr_gpcs_pri_mmu_ctrl_mmu_disable_m()|
4301 gr_gpcs_pri_mmu_ctrl_atomic_capability_mode_m()|
4302 gr_gpcs_pri_mmu_ctrl_atomic_capability_sys_ncoh_mode_m();
4301 gk20a_writel(g, gr_gpcs_pri_mmu_ctrl_r(), temp); 4303 gk20a_writel(g, gr_gpcs_pri_mmu_ctrl_r(), temp);
4302 gk20a_writel(g, gr_gpcs_pri_mmu_pm_unit_mask_r(), 0); 4304 gk20a_writel(g, gr_gpcs_pri_mmu_pm_unit_mask_r(), 0);
4303 gk20a_writel(g, gr_gpcs_pri_mmu_pm_req_mask_r(), 0); 4305 gk20a_writel(g, gr_gpcs_pri_mmu_pm_req_mask_r(), 0);