diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-04-20 15:47:45 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-02 19:05:41 -0400 |
commit | d805731c8e333f16e42517cae50648954b99c870 (patch) | |
tree | 4b3138f0fc4bdfa8c949355888f10f635f59fb1a | |
parent | 10540e3915d9be82863d8472e31a2683a8f73097 (diff) |
gpu: nvgpu: gv11b: hw header update for CL38424879
Bug 200300756
Change-Id: I2991d306905d2681cfb3031301e1b45a215ff89b
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1466955
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h | 4 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h index dc8473a5..22ad23bc 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h | |||
@@ -386,26 +386,6 @@ static inline u32 gmmu_pte_kind_z16_ms16_2cz_v(void) | |||
386 | { | 386 | { |
387 | return 0x0000005f; | 387 | return 0x0000005f; |
388 | } | 388 | } |
389 | static inline u32 gmmu_pte_kind_z16_4cz_v(void) | ||
390 | { | ||
391 | return 0x0000000c; | ||
392 | } | ||
393 | static inline u32 gmmu_pte_kind_z16_ms2_4cz_v(void) | ||
394 | { | ||
395 | return 0x0000000d; | ||
396 | } | ||
397 | static inline u32 gmmu_pte_kind_z16_ms4_4cz_v(void) | ||
398 | { | ||
399 | return 0x0000000e; | ||
400 | } | ||
401 | static inline u32 gmmu_pte_kind_z16_ms8_4cz_v(void) | ||
402 | { | ||
403 | return 0x0000000f; | ||
404 | } | ||
405 | static inline u32 gmmu_pte_kind_z16_ms16_4cz_v(void) | ||
406 | { | ||
407 | return 0x00000010; | ||
408 | } | ||
409 | static inline u32 gmmu_pte_kind_s8z24_v(void) | 389 | static inline u32 gmmu_pte_kind_s8z24_v(void) |
410 | { | 390 | { |
411 | return 0x00000011; | 391 | return 0x00000011; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h index f05910a9..38040723 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h | |||
@@ -142,10 +142,6 @@ static inline u32 mc_enable_pmedia_v(u32 r) | |||
142 | { | 142 | { |
143 | return (r >> 4) & 0x1; | 143 | return (r >> 4) & 0x1; |
144 | } | 144 | } |
145 | static inline u32 mc_enable_priv_ring_enabled_f(void) | ||
146 | { | ||
147 | return 0x20; | ||
148 | } | ||
149 | static inline u32 mc_enable_ce0_m(void) | 145 | static inline u32 mc_enable_ce0_m(void) |
150 | { | 146 | { |
151 | return 0x1 << 6; | 147 | return 0x1 << 6; |