diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/regops_gp106.c | 40 |
2 files changed, 0 insertions, 48 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 3408cdfa..da1a44a9 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -701,16 +701,8 @@ static const struct gpu_ops gp106_ops = { | |||
701 | .get_runcontrol_whitelist = gp106_get_runcontrol_whitelist, | 701 | .get_runcontrol_whitelist = gp106_get_runcontrol_whitelist, |
702 | .get_runcontrol_whitelist_count = | 702 | .get_runcontrol_whitelist_count = |
703 | gp106_get_runcontrol_whitelist_count, | 703 | gp106_get_runcontrol_whitelist_count, |
704 | .get_runcontrol_whitelist_ranges = | ||
705 | gp106_get_runcontrol_whitelist_ranges, | ||
706 | .get_runcontrol_whitelist_ranges_count = | ||
707 | gp106_get_runcontrol_whitelist_ranges_count, | ||
708 | .get_qctl_whitelist = gp106_get_qctl_whitelist, | 704 | .get_qctl_whitelist = gp106_get_qctl_whitelist, |
709 | .get_qctl_whitelist_count = gp106_get_qctl_whitelist_count, | 705 | .get_qctl_whitelist_count = gp106_get_qctl_whitelist_count, |
710 | .get_qctl_whitelist_ranges = gp106_get_qctl_whitelist_ranges, | ||
711 | .get_qctl_whitelist_ranges_count = | ||
712 | gp106_get_qctl_whitelist_ranges_count, | ||
713 | .apply_smpc_war = gp106_apply_smpc_war, | ||
714 | }, | 706 | }, |
715 | .mc = { | 707 | .mc = { |
716 | .intr_mask = mc_gp10b_intr_mask, | 708 | .intr_mask = mc_gp10b_intr_mask, |
diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.c b/drivers/gpu/nvgpu/gp106/regops_gp106.c index 25b88eeb..581b280d 100644 --- a/drivers/gpu/nvgpu/gp106/regops_gp106.c +++ b/drivers/gpu/nvgpu/gp106/regops_gp106.c | |||
@@ -23,12 +23,9 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/dbg_gpu_gk20a.h" | ||
27 | #include "gk20a/regops_gk20a.h" | 26 | #include "gk20a/regops_gk20a.h" |
28 | #include "regops_gp106.h" | 27 | #include "regops_gp106.h" |
29 | 28 | ||
30 | #include <nvgpu/bsearch.h> | ||
31 | |||
32 | static const struct regop_offset_range gp106_global_whitelist_ranges[] = { | 29 | static const struct regop_offset_range gp106_global_whitelist_ranges[] = { |
33 | { 0x000004f0, 1}, | 30 | { 0x000004f0, 1}, |
34 | { 0x00001a00, 3}, | 31 | { 0x00001a00, 3}, |
@@ -1697,23 +1694,12 @@ static const u32 gp106_runcontrol_whitelist[] = { | |||
1697 | static const u64 gp106_runcontrol_whitelist_count = | 1694 | static const u64 gp106_runcontrol_whitelist_count = |
1698 | ARRAY_SIZE(gp106_runcontrol_whitelist); | 1695 | ARRAY_SIZE(gp106_runcontrol_whitelist); |
1699 | 1696 | ||
1700 | static const struct regop_offset_range gp106_runcontrol_whitelist_ranges[] = { | ||
1701 | }; | ||
1702 | static const u64 gp106_runcontrol_whitelist_ranges_count = | ||
1703 | ARRAY_SIZE(gp106_runcontrol_whitelist_ranges); | ||
1704 | |||
1705 | |||
1706 | /* quad ctl */ | 1697 | /* quad ctl */ |
1707 | static const u32 gp106_qctl_whitelist[] = { | 1698 | static const u32 gp106_qctl_whitelist[] = { |
1708 | }; | 1699 | }; |
1709 | static const u64 gp106_qctl_whitelist_count = | 1700 | static const u64 gp106_qctl_whitelist_count = |
1710 | ARRAY_SIZE(gp106_qctl_whitelist); | 1701 | ARRAY_SIZE(gp106_qctl_whitelist); |
1711 | 1702 | ||
1712 | static const struct regop_offset_range gp106_qctl_whitelist_ranges[] = { | ||
1713 | }; | ||
1714 | static const u64 gp106_qctl_whitelist_ranges_count = | ||
1715 | ARRAY_SIZE(gp106_qctl_whitelist_ranges); | ||
1716 | |||
1717 | const struct regop_offset_range *gp106_get_global_whitelist_ranges(void) | 1703 | const struct regop_offset_range *gp106_get_global_whitelist_ranges(void) |
1718 | { | 1704 | { |
1719 | return gp106_global_whitelist_ranges; | 1705 | return gp106_global_whitelist_ranges; |
@@ -1744,16 +1730,6 @@ u64 gp106_get_runcontrol_whitelist_count(void) | |||
1744 | return gp106_runcontrol_whitelist_count; | 1730 | return gp106_runcontrol_whitelist_count; |
1745 | } | 1731 | } |
1746 | 1732 | ||
1747 | const struct regop_offset_range *gp106_get_runcontrol_whitelist_ranges(void) | ||
1748 | { | ||
1749 | return gp106_runcontrol_whitelist_ranges; | ||
1750 | } | ||
1751 | |||
1752 | u64 gp106_get_runcontrol_whitelist_ranges_count(void) | ||
1753 | { | ||
1754 | return gp106_runcontrol_whitelist_ranges_count; | ||
1755 | } | ||
1756 | |||
1757 | const u32 *gp106_get_qctl_whitelist(void) | 1733 | const u32 *gp106_get_qctl_whitelist(void) |
1758 | { | 1734 | { |
1759 | return gp106_qctl_whitelist; | 1735 | return gp106_qctl_whitelist; |
@@ -1763,19 +1739,3 @@ u64 gp106_get_qctl_whitelist_count(void) | |||
1763 | { | 1739 | { |
1764 | return gp106_qctl_whitelist_count; | 1740 | return gp106_qctl_whitelist_count; |
1765 | } | 1741 | } |
1766 | |||
1767 | const struct regop_offset_range *gp106_get_qctl_whitelist_ranges(void) | ||
1768 | { | ||
1769 | return gp106_qctl_whitelist_ranges; | ||
1770 | } | ||
1771 | |||
1772 | u64 gp106_get_qctl_whitelist_ranges_count(void) | ||
1773 | { | ||
1774 | return gp106_qctl_whitelist_ranges_count; | ||
1775 | } | ||
1776 | |||
1777 | int gp106_apply_smpc_war(struct dbg_session_gk20a *dbg_s) | ||
1778 | { | ||
1779 | /* Not needed on gp106 */ | ||
1780 | return 0; | ||
1781 | } | ||