summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2018-09-28 05:24:45 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-29 02:54:41 -0400
commitf22ea339b032dff13f281d4a468c9f83d5913110 (patch)
tree8b4fadfedbb5154b3d5ece66db4813a08996673d /drivers/gpu/nvgpu/include
parent894e04790b26d035d5cb1b5f26e689d2eb4b7c4a (diff)
gpu: nvgpu: remove big page setting on pascal+
We don't support big page size beginning Pascal, so set HAL gops.fb.set_mmu_page_size() to NULL on all those platforms Also remove these accessors from corresponding platforms fb_mmu_ctrl_use_pdb_big_page_size_v() fb_mmu_ctrl_use_pdb_big_page_size_true_f() fb_mmu_ctrl_use_pdb_big_page_size_false_f() Bug 2173122 Change-Id: I7353412860a7a6f8a993ca9184a0dc3ca9d749af Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1850946 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h14
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h14
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h12
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h12
4 files changed, 2 insertions, 50 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
index e2f7b9d2..df60beca 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"), 5 * copy of this software and associated documentation files (the "Software"),
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
76{ 76{
77 return (r >> 16U) & 0xffU; 77 return (r >> 16U) & 0xffU;
78} 78}
79static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r)
80{
81 return (r >> 11U) & 0x1U;
82}
83static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void)
84{
85 return 0x800U;
86}
87static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void)
88{
89 return 0x0U;
90}
91static inline u32 fb_priv_mmu_phy_secure_r(void) 79static inline u32 fb_priv_mmu_phy_secure_r(void)
92{ 80{
93 return 0x00100ce4U; 81 return 0x00100ce4U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h
index 5953abd9..c1ef4712 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"), 5 * copy of this software and associated documentation files (the "Software"),
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
76{ 76{
77 return (r >> 16U) & 0xffU; 77 return (r >> 16U) & 0xffU;
78} 78}
79static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r)
80{
81 return (r >> 11U) & 0x1U;
82}
83static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void)
84{
85 return 0x800U;
86}
87static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void)
88{
89 return 0x0U;
90}
91static inline u32 fb_priv_mmu_phy_secure_r(void) 79static inline u32 fb_priv_mmu_phy_secure_r(void)
92{ 80{
93 return 0x00100ce4U; 81 return 0x00100ce4U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
index 0f6a742e..80ff5dc2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
@@ -152,18 +152,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
152{ 152{
153 return (r >> 16U) & 0xffU; 153 return (r >> 16U) & 0xffU;
154} 154}
155static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r)
156{
157 return (r >> 11U) & 0x1U;
158}
159static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void)
160{
161 return 0x800U;
162}
163static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void)
164{
165 return 0x0U;
166}
167static inline u32 fb_mmu_ctrl_atomic_capability_mode_f(u32 v) 155static inline u32 fb_mmu_ctrl_atomic_capability_mode_f(u32 v)
168{ 156{
169 return (v & 0x3U) << 24U; 157 return (v & 0x3U) << 24U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
index 0982e3dc..86bdaf28 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
76{ 76{
77 return (r >> 16U) & 0xffU; 77 return (r >> 16U) & 0xffU;
78} 78}
79static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r)
80{
81 return (r >> 11U) & 0x1U;
82}
83static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void)
84{
85 return 0x800U;
86}
87static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void)
88{
89 return 0x0U;
90}
91static inline u32 fb_priv_mmu_phy_secure_r(void) 79static inline u32 fb_priv_mmu_phy_secure_r(void)
92{ 80{
93 return 0x00100ce4U; 81 return 0x00100ce4U;