diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv100')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/regops_gv100.c | 24 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/regops_gv100.h | 14 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drivers/gpu/nvgpu/gv100/regops_gv100.c b/drivers/gpu/nvgpu/gv100/regops_gv100.c index 857fc01d..c6ce6b94 100644 --- a/drivers/gpu/nvgpu/gv100/regops_gv100.c +++ b/drivers/gpu/nvgpu/gv100/regops_gv100.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Tegra GV100 GPU Driver Register Ops | 2 | * Tegra GV100 GPU Driver Register Ops |
3 | * | 3 | * |
4 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2018, 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"), |
@@ -5623,7 +5623,7 @@ static const struct regop_offset_range gv100_global_whitelist_ranges[] = { | |||
5623 | { 0x00a3eed4, 7}, | 5623 | { 0x00a3eed4, 7}, |
5624 | { 0x00a3eef4, 2}}; | 5624 | { 0x00a3eef4, 2}}; |
5625 | 5625 | ||
5626 | static const u32 gv100_global_whitelist_ranges_count = | 5626 | static const u64 gv100_global_whitelist_ranges_count = |
5627 | ARRAY_SIZE(gv100_global_whitelist_ranges); | 5627 | ARRAY_SIZE(gv100_global_whitelist_ranges); |
5628 | 5628 | ||
5629 | /* context */ | 5629 | /* context */ |
@@ -5631,24 +5631,24 @@ static const u32 gv100_global_whitelist_ranges_count = | |||
5631 | /* runcontrol */ | 5631 | /* runcontrol */ |
5632 | static const u32 gv100_runcontrol_whitelist[] = { | 5632 | static const u32 gv100_runcontrol_whitelist[] = { |
5633 | }; | 5633 | }; |
5634 | static const u32 gv100_runcontrol_whitelist_count = | 5634 | static const u64 gv100_runcontrol_whitelist_count = |
5635 | ARRAY_SIZE(gv100_runcontrol_whitelist); | 5635 | ARRAY_SIZE(gv100_runcontrol_whitelist); |
5636 | 5636 | ||
5637 | static const struct regop_offset_range gv100_runcontrol_whitelist_ranges[] = { | 5637 | static const struct regop_offset_range gv100_runcontrol_whitelist_ranges[] = { |
5638 | }; | 5638 | }; |
5639 | static const u32 gv100_runcontrol_whitelist_ranges_count = | 5639 | static const u64 gv100_runcontrol_whitelist_ranges_count = |
5640 | ARRAY_SIZE(gv100_runcontrol_whitelist_ranges); | 5640 | ARRAY_SIZE(gv100_runcontrol_whitelist_ranges); |
5641 | 5641 | ||
5642 | 5642 | ||
5643 | /* quad ctl */ | 5643 | /* quad ctl */ |
5644 | static const u32 gv100_qctl_whitelist[] = { | 5644 | static const u32 gv100_qctl_whitelist[] = { |
5645 | }; | 5645 | }; |
5646 | static const u32 gv100_qctl_whitelist_count = | 5646 | static const u64 gv100_qctl_whitelist_count = |
5647 | ARRAY_SIZE(gv100_qctl_whitelist); | 5647 | ARRAY_SIZE(gv100_qctl_whitelist); |
5648 | 5648 | ||
5649 | static const struct regop_offset_range gv100_qctl_whitelist_ranges[] = { | 5649 | static const struct regop_offset_range gv100_qctl_whitelist_ranges[] = { |
5650 | }; | 5650 | }; |
5651 | static const u32 gv100_qctl_whitelist_ranges_count = | 5651 | static const u64 gv100_qctl_whitelist_ranges_count = |
5652 | ARRAY_SIZE(gv100_qctl_whitelist_ranges); | 5652 | ARRAY_SIZE(gv100_qctl_whitelist_ranges); |
5653 | 5653 | ||
5654 | const struct regop_offset_range *gv100_get_global_whitelist_ranges(void) | 5654 | const struct regop_offset_range *gv100_get_global_whitelist_ranges(void) |
@@ -5656,7 +5656,7 @@ const struct regop_offset_range *gv100_get_global_whitelist_ranges(void) | |||
5656 | return gv100_global_whitelist_ranges; | 5656 | return gv100_global_whitelist_ranges; |
5657 | } | 5657 | } |
5658 | 5658 | ||
5659 | int gv100_get_global_whitelist_ranges_count(void) | 5659 | u64 gv100_get_global_whitelist_ranges_count(void) |
5660 | { | 5660 | { |
5661 | return gv100_global_whitelist_ranges_count; | 5661 | return gv100_global_whitelist_ranges_count; |
5662 | } | 5662 | } |
@@ -5666,7 +5666,7 @@ const struct regop_offset_range *gv100_get_context_whitelist_ranges(void) | |||
5666 | return gv100_global_whitelist_ranges; | 5666 | return gv100_global_whitelist_ranges; |
5667 | } | 5667 | } |
5668 | 5668 | ||
5669 | int gv100_get_context_whitelist_ranges_count(void) | 5669 | u64 gv100_get_context_whitelist_ranges_count(void) |
5670 | { | 5670 | { |
5671 | return gv100_global_whitelist_ranges_count; | 5671 | return gv100_global_whitelist_ranges_count; |
5672 | } | 5672 | } |
@@ -5676,7 +5676,7 @@ const u32 *gv100_get_runcontrol_whitelist(void) | |||
5676 | return gv100_runcontrol_whitelist; | 5676 | return gv100_runcontrol_whitelist; |
5677 | } | 5677 | } |
5678 | 5678 | ||
5679 | int gv100_get_runcontrol_whitelist_count(void) | 5679 | u64 gv100_get_runcontrol_whitelist_count(void) |
5680 | { | 5680 | { |
5681 | return gv100_runcontrol_whitelist_count; | 5681 | return gv100_runcontrol_whitelist_count; |
5682 | } | 5682 | } |
@@ -5686,7 +5686,7 @@ const struct regop_offset_range *gv100_get_runcontrol_whitelist_ranges(void) | |||
5686 | return gv100_runcontrol_whitelist_ranges; | 5686 | return gv100_runcontrol_whitelist_ranges; |
5687 | } | 5687 | } |
5688 | 5688 | ||
5689 | int gv100_get_runcontrol_whitelist_ranges_count(void) | 5689 | u64 gv100_get_runcontrol_whitelist_ranges_count(void) |
5690 | { | 5690 | { |
5691 | return gv100_runcontrol_whitelist_ranges_count; | 5691 | return gv100_runcontrol_whitelist_ranges_count; |
5692 | } | 5692 | } |
@@ -5696,7 +5696,7 @@ const u32 *gv100_get_qctl_whitelist(void) | |||
5696 | return gv100_qctl_whitelist; | 5696 | return gv100_qctl_whitelist; |
5697 | } | 5697 | } |
5698 | 5698 | ||
5699 | int gv100_get_qctl_whitelist_count(void) | 5699 | u64 gv100_get_qctl_whitelist_count(void) |
5700 | { | 5700 | { |
5701 | return gv100_qctl_whitelist_count; | 5701 | return gv100_qctl_whitelist_count; |
5702 | } | 5702 | } |
@@ -5706,7 +5706,7 @@ const struct regop_offset_range *gv100_get_qctl_whitelist_ranges(void) | |||
5706 | return gv100_qctl_whitelist_ranges; | 5706 | return gv100_qctl_whitelist_ranges; |
5707 | } | 5707 | } |
5708 | 5708 | ||
5709 | int gv100_get_qctl_whitelist_ranges_count(void) | 5709 | u64 gv100_get_qctl_whitelist_ranges_count(void) |
5710 | { | 5710 | { |
5711 | return gv100_qctl_whitelist_ranges_count; | 5711 | return gv100_qctl_whitelist_ranges_count; |
5712 | } | 5712 | } |
diff --git a/drivers/gpu/nvgpu/gv100/regops_gv100.h b/drivers/gpu/nvgpu/gv100/regops_gv100.h index 06e5b8e1..4abfeaac 100644 --- a/drivers/gpu/nvgpu/gv100/regops_gv100.h +++ b/drivers/gpu/nvgpu/gv100/regops_gv100.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Tegra GV100 GPU Driver Register Ops | 3 | * Tegra GV100 GPU Driver Register Ops |
4 | * | 4 | * |
5 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 5 | * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. |
6 | * | 6 | * |
7 | * Permission is hereby granted, free of charge, to any person obtaining a | 7 | * Permission is hereby granted, free of charge, to any person obtaining a |
8 | * copy of this software and associated documentation files (the "Software"), | 8 | * copy of this software and associated documentation files (the "Software"), |
@@ -26,17 +26,17 @@ | |||
26 | #define __REGOPS_GV100_H_ | 26 | #define __REGOPS_GV100_H_ |
27 | 27 | ||
28 | const struct regop_offset_range *gv100_get_global_whitelist_ranges(void); | 28 | const struct regop_offset_range *gv100_get_global_whitelist_ranges(void); |
29 | int gv100_get_global_whitelist_ranges_count(void); | 29 | u64 gv100_get_global_whitelist_ranges_count(void); |
30 | const struct regop_offset_range *gv100_get_context_whitelist_ranges(void); | 30 | const struct regop_offset_range *gv100_get_context_whitelist_ranges(void); |
31 | int gv100_get_context_whitelist_ranges_count(void); | 31 | u64 gv100_get_context_whitelist_ranges_count(void); |
32 | const u32 *gv100_get_runcontrol_whitelist(void); | 32 | const u32 *gv100_get_runcontrol_whitelist(void); |
33 | int gv100_get_runcontrol_whitelist_count(void); | 33 | u64 gv100_get_runcontrol_whitelist_count(void); |
34 | const struct regop_offset_range *gv100_get_runcontrol_whitelist_ranges(void); | 34 | const struct regop_offset_range *gv100_get_runcontrol_whitelist_ranges(void); |
35 | int gv100_get_runcontrol_whitelist_ranges_count(void); | 35 | u64 gv100_get_runcontrol_whitelist_ranges_count(void); |
36 | const u32 *gv100_get_qctl_whitelist(void); | 36 | const u32 *gv100_get_qctl_whitelist(void); |
37 | int gv100_get_qctl_whitelist_count(void); | 37 | u64 gv100_get_qctl_whitelist_count(void); |
38 | const struct regop_offset_range *gv100_get_qctl_whitelist_ranges(void); | 38 | const struct regop_offset_range *gv100_get_qctl_whitelist_ranges(void); |
39 | int gv100_get_qctl_whitelist_ranges_count(void); | 39 | u64 gv100_get_qctl_whitelist_ranges_count(void); |
40 | int gv100_apply_smpc_war(struct dbg_session_gk20a *dbg_s); | 40 | int gv100_apply_smpc_war(struct dbg_session_gk20a *dbg_s); |
41 | 41 | ||
42 | #endif /* __REGOPS_GV11B_H_ */ | 42 | #endif /* __REGOPS_GV11B_H_ */ |