diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-12-14 16:20:19 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-18 10:59:13 -0500 |
commit | 9c3f2b54746f764e1b695797c78bc46b8713f067 (patch) | |
tree | f5528a80d37a3def6dd4176bd1ad3ed2a406fb88 /drivers/gpu/drm/amd/amdgpu | |
parent | 131b4b3686b701079e8fb82eb9384c8acdd3fc72 (diff) |
drm/amdgpu: rename amdgpu_program_register_sequence
add device for consistency with other functions in this file.
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik.c | 120 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 24 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 30 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 114 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 54 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 48 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 60 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 102 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 30 |
14 files changed, 311 insertions, 311 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 81c1ddb9eb3a..f10f4fc7dbe0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1913,7 +1913,7 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev); | |||
1913 | void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); | 1913 | void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); |
1914 | int amdgpu_ttm_init(struct amdgpu_device *adev); | 1914 | int amdgpu_ttm_init(struct amdgpu_device *adev); |
1915 | void amdgpu_ttm_fini(struct amdgpu_device *adev); | 1915 | void amdgpu_ttm_fini(struct amdgpu_device *adev); |
1916 | void amdgpu_program_register_sequence(struct amdgpu_device *adev, | 1916 | void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, |
1917 | const u32 *registers, | 1917 | const u32 *registers, |
1918 | const u32 array_size); | 1918 | const u32 array_size); |
1919 | 1919 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 7b44ca29a2c8..05e5c6822f9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -342,7 +342,7 @@ static void amdgpu_device_vram_scratch_fini(struct amdgpu_device *adev) | |||
342 | } | 342 | } |
343 | 343 | ||
344 | /** | 344 | /** |
345 | * amdgpu_program_register_sequence - program an array of registers. | 345 | * amdgpu_device_program_register_sequence - program an array of registers. |
346 | * | 346 | * |
347 | * @adev: amdgpu_device pointer | 347 | * @adev: amdgpu_device pointer |
348 | * @registers: pointer to the register array | 348 | * @registers: pointer to the register array |
@@ -351,9 +351,9 @@ static void amdgpu_device_vram_scratch_fini(struct amdgpu_device *adev) | |||
351 | * Programs an array or registers with and and or masks. | 351 | * Programs an array or registers with and and or masks. |
352 | * This is a helper for setting golden registers. | 352 | * This is a helper for setting golden registers. |
353 | */ | 353 | */ |
354 | void amdgpu_program_register_sequence(struct amdgpu_device *adev, | 354 | void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, |
355 | const u32 *registers, | 355 | const u32 *registers, |
356 | const u32 array_size) | 356 | const u32 array_size) |
357 | { | 357 | { |
358 | u32 tmp, reg, and_mask, or_mask; | 358 | u32 tmp, reg, and_mask, or_mask; |
359 | int i; | 359 | int i; |
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index 8ba056a2a5da..39d49712f8c9 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik.c +++ b/drivers/gpu/drm/amd/amdgpu/cik.c | |||
@@ -755,74 +755,74 @@ static void cik_init_golden_registers(struct amdgpu_device *adev) | |||
755 | 755 | ||
756 | switch (adev->asic_type) { | 756 | switch (adev->asic_type) { |
757 | case CHIP_BONAIRE: | 757 | case CHIP_BONAIRE: |
758 | amdgpu_program_register_sequence(adev, | 758 | amdgpu_device_program_register_sequence(adev, |
759 | bonaire_mgcg_cgcg_init, | 759 | bonaire_mgcg_cgcg_init, |
760 | ARRAY_SIZE(bonaire_mgcg_cgcg_init)); | 760 | ARRAY_SIZE(bonaire_mgcg_cgcg_init)); |
761 | amdgpu_program_register_sequence(adev, | 761 | amdgpu_device_program_register_sequence(adev, |
762 | bonaire_golden_registers, | 762 | bonaire_golden_registers, |
763 | ARRAY_SIZE(bonaire_golden_registers)); | 763 | ARRAY_SIZE(bonaire_golden_registers)); |
764 | amdgpu_program_register_sequence(adev, | 764 | amdgpu_device_program_register_sequence(adev, |
765 | bonaire_golden_common_registers, | 765 | bonaire_golden_common_registers, |
766 | ARRAY_SIZE(bonaire_golden_common_registers)); | 766 | ARRAY_SIZE(bonaire_golden_common_registers)); |
767 | amdgpu_program_register_sequence(adev, | 767 | amdgpu_device_program_register_sequence(adev, |
768 | bonaire_golden_spm_registers, | 768 | bonaire_golden_spm_registers, |
769 | ARRAY_SIZE(bonaire_golden_spm_registers)); | 769 | ARRAY_SIZE(bonaire_golden_spm_registers)); |
770 | break; | 770 | break; |
771 | case CHIP_KABINI: | 771 | case CHIP_KABINI: |
772 | amdgpu_program_register_sequence(adev, | 772 | amdgpu_device_program_register_sequence(adev, |
773 | kalindi_mgcg_cgcg_init, | 773 | kalindi_mgcg_cgcg_init, |
774 | ARRAY_SIZE(kalindi_mgcg_cgcg_init)); | 774 | ARRAY_SIZE(kalindi_mgcg_cgcg_init)); |
775 | amdgpu_program_register_sequence(adev, | 775 | amdgpu_device_program_register_sequence(adev, |
776 | kalindi_golden_registers, | 776 | kalindi_golden_registers, |
777 | ARRAY_SIZE(kalindi_golden_registers)); | 777 | ARRAY_SIZE(kalindi_golden_registers)); |
778 | amdgpu_program_register_sequence(adev, | 778 | amdgpu_device_program_register_sequence(adev, |
779 | kalindi_golden_common_registers, | 779 | kalindi_golden_common_registers, |
780 | ARRAY_SIZE(kalindi_golden_common_registers)); | 780 | ARRAY_SIZE(kalindi_golden_common_registers)); |
781 | amdgpu_program_register_sequence(adev, | 781 | amdgpu_device_program_register_sequence(adev, |
782 | kalindi_golden_spm_registers, | 782 | kalindi_golden_spm_registers, |
783 | ARRAY_SIZE(kalindi_golden_spm_registers)); | 783 | ARRAY_SIZE(kalindi_golden_spm_registers)); |
784 | break; | 784 | break; |
785 | case CHIP_MULLINS: | 785 | case CHIP_MULLINS: |
786 | amdgpu_program_register_sequence(adev, | 786 | amdgpu_device_program_register_sequence(adev, |
787 | kalindi_mgcg_cgcg_init, | 787 | kalindi_mgcg_cgcg_init, |
788 | ARRAY_SIZE(kalindi_mgcg_cgcg_init)); | 788 | ARRAY_SIZE(kalindi_mgcg_cgcg_init)); |
789 | amdgpu_program_register_sequence(adev, | 789 | amdgpu_device_program_register_sequence(adev, |
790 | godavari_golden_registers, | 790 | godavari_golden_registers, |
791 | ARRAY_SIZE(godavari_golden_registers)); | 791 | ARRAY_SIZE(godavari_golden_registers)); |
792 | amdgpu_program_register_sequence(adev, | 792 | amdgpu_device_program_register_sequence(adev, |
793 | kalindi_golden_common_registers, | 793 | kalindi_golden_common_registers, |
794 | ARRAY_SIZE(kalindi_golden_common_registers)); | 794 | ARRAY_SIZE(kalindi_golden_common_registers)); |
795 | amdgpu_program_register_sequence(adev, | 795 | amdgpu_device_program_register_sequence(adev, |
796 | kalindi_golden_spm_registers, | 796 | kalindi_golden_spm_registers, |
797 | ARRAY_SIZE(kalindi_golden_spm_registers)); | 797 | ARRAY_SIZE(kalindi_golden_spm_registers)); |
798 | break; | 798 | break; |
799 | case CHIP_KAVERI: | 799 | case CHIP_KAVERI: |
800 | amdgpu_program_register_sequence(adev, | 800 | amdgpu_device_program_register_sequence(adev, |
801 | spectre_mgcg_cgcg_init, | 801 | spectre_mgcg_cgcg_init, |
802 | ARRAY_SIZE(spectre_mgcg_cgcg_init)); | 802 | ARRAY_SIZE(spectre_mgcg_cgcg_init)); |
803 | amdgpu_program_register_sequence(adev, | 803 | amdgpu_device_program_register_sequence(adev, |
804 | spectre_golden_registers, | 804 | spectre_golden_registers, |
805 | ARRAY_SIZE(spectre_golden_registers)); | 805 | ARRAY_SIZE(spectre_golden_registers)); |
806 | amdgpu_program_register_sequence(adev, | 806 | amdgpu_device_program_register_sequence(adev, |
807 | spectre_golden_common_registers, | 807 | spectre_golden_common_registers, |
808 | ARRAY_SIZE(spectre_golden_common_registers)); | 808 | ARRAY_SIZE(spectre_golden_common_registers)); |
809 | amdgpu_program_register_sequence(adev, | 809 | amdgpu_device_program_register_sequence(adev, |
810 | spectre_golden_spm_registers, | 810 | spectre_golden_spm_registers, |
811 | ARRAY_SIZE(spectre_golden_spm_registers)); | 811 | ARRAY_SIZE(spectre_golden_spm_registers)); |
812 | break; | 812 | break; |
813 | case CHIP_HAWAII: | 813 | case CHIP_HAWAII: |
814 | amdgpu_program_register_sequence(adev, | 814 | amdgpu_device_program_register_sequence(adev, |
815 | hawaii_mgcg_cgcg_init, | 815 | hawaii_mgcg_cgcg_init, |
816 | ARRAY_SIZE(hawaii_mgcg_cgcg_init)); | 816 | ARRAY_SIZE(hawaii_mgcg_cgcg_init)); |
817 | amdgpu_program_register_sequence(adev, | 817 | amdgpu_device_program_register_sequence(adev, |
818 | hawaii_golden_registers, | 818 | hawaii_golden_registers, |
819 | ARRAY_SIZE(hawaii_golden_registers)); | 819 | ARRAY_SIZE(hawaii_golden_registers)); |
820 | amdgpu_program_register_sequence(adev, | 820 | amdgpu_device_program_register_sequence(adev, |
821 | hawaii_golden_common_registers, | 821 | hawaii_golden_common_registers, |
822 | ARRAY_SIZE(hawaii_golden_common_registers)); | 822 | ARRAY_SIZE(hawaii_golden_common_registers)); |
823 | amdgpu_program_register_sequence(adev, | 823 | amdgpu_device_program_register_sequence(adev, |
824 | hawaii_golden_spm_registers, | 824 | hawaii_golden_spm_registers, |
825 | ARRAY_SIZE(hawaii_golden_spm_registers)); | 825 | ARRAY_SIZE(hawaii_golden_spm_registers)); |
826 | break; | 826 | break; |
827 | default: | 827 | default: |
828 | break; | 828 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index a397111c2ced..f34bc68aadfb 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | |||
@@ -145,20 +145,20 @@ static void dce_v10_0_init_golden_registers(struct amdgpu_device *adev) | |||
145 | { | 145 | { |
146 | switch (adev->asic_type) { | 146 | switch (adev->asic_type) { |
147 | case CHIP_FIJI: | 147 | case CHIP_FIJI: |
148 | amdgpu_program_register_sequence(adev, | 148 | amdgpu_device_program_register_sequence(adev, |
149 | fiji_mgcg_cgcg_init, | 149 | fiji_mgcg_cgcg_init, |
150 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); | 150 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); |
151 | amdgpu_program_register_sequence(adev, | 151 | amdgpu_device_program_register_sequence(adev, |
152 | golden_settings_fiji_a10, | 152 | golden_settings_fiji_a10, |
153 | ARRAY_SIZE(golden_settings_fiji_a10)); | 153 | ARRAY_SIZE(golden_settings_fiji_a10)); |
154 | break; | 154 | break; |
155 | case CHIP_TONGA: | 155 | case CHIP_TONGA: |
156 | amdgpu_program_register_sequence(adev, | 156 | amdgpu_device_program_register_sequence(adev, |
157 | tonga_mgcg_cgcg_init, | 157 | tonga_mgcg_cgcg_init, |
158 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); | 158 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); |
159 | amdgpu_program_register_sequence(adev, | 159 | amdgpu_device_program_register_sequence(adev, |
160 | golden_settings_tonga_a11, | 160 | golden_settings_tonga_a11, |
161 | ARRAY_SIZE(golden_settings_tonga_a11)); | 161 | ARRAY_SIZE(golden_settings_tonga_a11)); |
162 | break; | 162 | break; |
163 | default: | 163 | default: |
164 | break; | 164 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 67e670989e81..26378bd6aba4 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | |||
@@ -154,28 +154,28 @@ static void dce_v11_0_init_golden_registers(struct amdgpu_device *adev) | |||
154 | { | 154 | { |
155 | switch (adev->asic_type) { | 155 | switch (adev->asic_type) { |
156 | case CHIP_CARRIZO: | 156 | case CHIP_CARRIZO: |
157 | amdgpu_program_register_sequence(adev, | 157 | amdgpu_device_program_register_sequence(adev, |
158 | cz_mgcg_cgcg_init, | 158 | cz_mgcg_cgcg_init, |
159 | ARRAY_SIZE(cz_mgcg_cgcg_init)); | 159 | ARRAY_SIZE(cz_mgcg_cgcg_init)); |
160 | amdgpu_program_register_sequence(adev, | 160 | amdgpu_device_program_register_sequence(adev, |
161 | cz_golden_settings_a11, | 161 | cz_golden_settings_a11, |
162 | ARRAY_SIZE(cz_golden_settings_a11)); | 162 | ARRAY_SIZE(cz_golden_settings_a11)); |
163 | break; | 163 | break; |
164 | case CHIP_STONEY: | 164 | case CHIP_STONEY: |
165 | amdgpu_program_register_sequence(adev, | 165 | amdgpu_device_program_register_sequence(adev, |
166 | stoney_golden_settings_a11, | 166 | stoney_golden_settings_a11, |
167 | ARRAY_SIZE(stoney_golden_settings_a11)); | 167 | ARRAY_SIZE(stoney_golden_settings_a11)); |
168 | break; | 168 | break; |
169 | case CHIP_POLARIS11: | 169 | case CHIP_POLARIS11: |
170 | case CHIP_POLARIS12: | 170 | case CHIP_POLARIS12: |
171 | amdgpu_program_register_sequence(adev, | 171 | amdgpu_device_program_register_sequence(adev, |
172 | polaris11_golden_settings_a11, | 172 | polaris11_golden_settings_a11, |
173 | ARRAY_SIZE(polaris11_golden_settings_a11)); | 173 | ARRAY_SIZE(polaris11_golden_settings_a11)); |
174 | break; | 174 | break; |
175 | case CHIP_POLARIS10: | 175 | case CHIP_POLARIS10: |
176 | amdgpu_program_register_sequence(adev, | 176 | amdgpu_device_program_register_sequence(adev, |
177 | polaris10_golden_settings_a11, | 177 | polaris10_golden_settings_a11, |
178 | ARRAY_SIZE(polaris10_golden_settings_a11)); | 178 | ARRAY_SIZE(polaris10_golden_settings_a11)); |
179 | break; | 179 | break; |
180 | default: | 180 | default: |
181 | break; | 181 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index c7dc69031fb5..4a9c28cd144d 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -679,55 +679,55 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev) | |||
679 | { | 679 | { |
680 | switch (adev->asic_type) { | 680 | switch (adev->asic_type) { |
681 | case CHIP_TOPAZ: | 681 | case CHIP_TOPAZ: |
682 | amdgpu_program_register_sequence(adev, | 682 | amdgpu_device_program_register_sequence(adev, |
683 | iceland_mgcg_cgcg_init, | 683 | iceland_mgcg_cgcg_init, |
684 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); | 684 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); |
685 | amdgpu_program_register_sequence(adev, | 685 | amdgpu_device_program_register_sequence(adev, |
686 | golden_settings_iceland_a11, | 686 | golden_settings_iceland_a11, |
687 | ARRAY_SIZE(golden_settings_iceland_a11)); | 687 | ARRAY_SIZE(golden_settings_iceland_a11)); |
688 | amdgpu_program_register_sequence(adev, | 688 | amdgpu_device_program_register_sequence(adev, |
689 | iceland_golden_common_all, | 689 | iceland_golden_common_all, |
690 | ARRAY_SIZE(iceland_golden_common_all)); | 690 | ARRAY_SIZE(iceland_golden_common_all)); |
691 | break; | 691 | break; |
692 | case CHIP_FIJI: | 692 | case CHIP_FIJI: |
693 | amdgpu_program_register_sequence(adev, | 693 | amdgpu_device_program_register_sequence(adev, |
694 | fiji_mgcg_cgcg_init, | 694 | fiji_mgcg_cgcg_init, |
695 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); | 695 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); |
696 | amdgpu_program_register_sequence(adev, | 696 | amdgpu_device_program_register_sequence(adev, |
697 | golden_settings_fiji_a10, | 697 | golden_settings_fiji_a10, |
698 | ARRAY_SIZE(golden_settings_fiji_a10)); | 698 | ARRAY_SIZE(golden_settings_fiji_a10)); |
699 | amdgpu_program_register_sequence(adev, | 699 | amdgpu_device_program_register_sequence(adev, |
700 | fiji_golden_common_all, | 700 | fiji_golden_common_all, |
701 | ARRAY_SIZE(fiji_golden_common_all)); | 701 | ARRAY_SIZE(fiji_golden_common_all)); |
702 | break; | 702 | break; |
703 | 703 | ||
704 | case CHIP_TONGA: | 704 | case CHIP_TONGA: |
705 | amdgpu_program_register_sequence(adev, | 705 | amdgpu_device_program_register_sequence(adev, |
706 | tonga_mgcg_cgcg_init, | 706 | tonga_mgcg_cgcg_init, |
707 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); | 707 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); |
708 | amdgpu_program_register_sequence(adev, | 708 | amdgpu_device_program_register_sequence(adev, |
709 | golden_settings_tonga_a11, | 709 | golden_settings_tonga_a11, |
710 | ARRAY_SIZE(golden_settings_tonga_a11)); | 710 | ARRAY_SIZE(golden_settings_tonga_a11)); |
711 | amdgpu_program_register_sequence(adev, | 711 | amdgpu_device_program_register_sequence(adev, |
712 | tonga_golden_common_all, | 712 | tonga_golden_common_all, |
713 | ARRAY_SIZE(tonga_golden_common_all)); | 713 | ARRAY_SIZE(tonga_golden_common_all)); |
714 | break; | 714 | break; |
715 | case CHIP_POLARIS11: | 715 | case CHIP_POLARIS11: |
716 | case CHIP_POLARIS12: | 716 | case CHIP_POLARIS12: |
717 | amdgpu_program_register_sequence(adev, | 717 | amdgpu_device_program_register_sequence(adev, |
718 | golden_settings_polaris11_a11, | 718 | golden_settings_polaris11_a11, |
719 | ARRAY_SIZE(golden_settings_polaris11_a11)); | 719 | ARRAY_SIZE(golden_settings_polaris11_a11)); |
720 | amdgpu_program_register_sequence(adev, | 720 | amdgpu_device_program_register_sequence(adev, |
721 | polaris11_golden_common_all, | 721 | polaris11_golden_common_all, |
722 | ARRAY_SIZE(polaris11_golden_common_all)); | 722 | ARRAY_SIZE(polaris11_golden_common_all)); |
723 | break; | 723 | break; |
724 | case CHIP_POLARIS10: | 724 | case CHIP_POLARIS10: |
725 | amdgpu_program_register_sequence(adev, | 725 | amdgpu_device_program_register_sequence(adev, |
726 | golden_settings_polaris10_a11, | 726 | golden_settings_polaris10_a11, |
727 | ARRAY_SIZE(golden_settings_polaris10_a11)); | 727 | ARRAY_SIZE(golden_settings_polaris10_a11)); |
728 | amdgpu_program_register_sequence(adev, | 728 | amdgpu_device_program_register_sequence(adev, |
729 | polaris10_golden_common_all, | 729 | polaris10_golden_common_all, |
730 | ARRAY_SIZE(polaris10_golden_common_all)); | 730 | ARRAY_SIZE(polaris10_golden_common_all)); |
731 | WREG32_SMC(ixCG_ACLK_CNTL, 0x0000001C); | 731 | WREG32_SMC(ixCG_ACLK_CNTL, 0x0000001C); |
732 | if (adev->pdev->revision == 0xc7 && | 732 | if (adev->pdev->revision == 0xc7 && |
733 | ((adev->pdev->subsystem_device == 0xb37 && adev->pdev->subsystem_vendor == 0x1002) || | 733 | ((adev->pdev->subsystem_device == 0xb37 && adev->pdev->subsystem_vendor == 0x1002) || |
@@ -738,26 +738,26 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev) | |||
738 | } | 738 | } |
739 | break; | 739 | break; |
740 | case CHIP_CARRIZO: | 740 | case CHIP_CARRIZO: |
741 | amdgpu_program_register_sequence(adev, | 741 | amdgpu_device_program_register_sequence(adev, |
742 | cz_mgcg_cgcg_init, | 742 | cz_mgcg_cgcg_init, |
743 | ARRAY_SIZE(cz_mgcg_cgcg_init)); | 743 | ARRAY_SIZE(cz_mgcg_cgcg_init)); |
744 | amdgpu_program_register_sequence(adev, | 744 | amdgpu_device_program_register_sequence(adev, |
745 | cz_golden_settings_a11, | 745 | cz_golden_settings_a11, |
746 | ARRAY_SIZE(cz_golden_settings_a11)); | 746 | ARRAY_SIZE(cz_golden_settings_a11)); |
747 | amdgpu_program_register_sequence(adev, | 747 | amdgpu_device_program_register_sequence(adev, |
748 | cz_golden_common_all, | 748 | cz_golden_common_all, |
749 | ARRAY_SIZE(cz_golden_common_all)); | 749 | ARRAY_SIZE(cz_golden_common_all)); |
750 | break; | 750 | break; |
751 | case CHIP_STONEY: | 751 | case CHIP_STONEY: |
752 | amdgpu_program_register_sequence(adev, | 752 | amdgpu_device_program_register_sequence(adev, |
753 | stoney_mgcg_cgcg_init, | 753 | stoney_mgcg_cgcg_init, |
754 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); | 754 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); |
755 | amdgpu_program_register_sequence(adev, | 755 | amdgpu_device_program_register_sequence(adev, |
756 | stoney_golden_settings_a11, | 756 | stoney_golden_settings_a11, |
757 | ARRAY_SIZE(stoney_golden_settings_a11)); | 757 | ARRAY_SIZE(stoney_golden_settings_a11)); |
758 | amdgpu_program_register_sequence(adev, | 758 | amdgpu_device_program_register_sequence(adev, |
759 | stoney_golden_common_all, | 759 | stoney_golden_common_all, |
760 | ARRAY_SIZE(stoney_golden_common_all)); | 760 | ARRAY_SIZE(stoney_golden_common_all)); |
761 | break; | 761 | break; |
762 | default: | 762 | default: |
763 | break; | 763 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 9c28e18741ea..c4285395b5fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | |||
@@ -67,12 +67,12 @@ static void gmc_v7_0_init_golden_registers(struct amdgpu_device *adev) | |||
67 | { | 67 | { |
68 | switch (adev->asic_type) { | 68 | switch (adev->asic_type) { |
69 | case CHIP_TOPAZ: | 69 | case CHIP_TOPAZ: |
70 | amdgpu_program_register_sequence(adev, | 70 | amdgpu_device_program_register_sequence(adev, |
71 | iceland_mgcg_cgcg_init, | 71 | iceland_mgcg_cgcg_init, |
72 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); | 72 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); |
73 | amdgpu_program_register_sequence(adev, | 73 | amdgpu_device_program_register_sequence(adev, |
74 | golden_settings_iceland_a11, | 74 | golden_settings_iceland_a11, |
75 | ARRAY_SIZE(golden_settings_iceland_a11)); | 75 | ARRAY_SIZE(golden_settings_iceland_a11)); |
76 | break; | 76 | break; |
77 | default: | 77 | default: |
78 | break; | 78 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index efed20ac4a01..6641276ecbdf 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |||
@@ -120,44 +120,44 @@ static void gmc_v8_0_init_golden_registers(struct amdgpu_device *adev) | |||
120 | { | 120 | { |
121 | switch (adev->asic_type) { | 121 | switch (adev->asic_type) { |
122 | case CHIP_FIJI: | 122 | case CHIP_FIJI: |
123 | amdgpu_program_register_sequence(adev, | 123 | amdgpu_device_program_register_sequence(adev, |
124 | fiji_mgcg_cgcg_init, | 124 | fiji_mgcg_cgcg_init, |
125 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); | 125 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); |
126 | amdgpu_program_register_sequence(adev, | 126 | amdgpu_device_program_register_sequence(adev, |
127 | golden_settings_fiji_a10, | 127 | golden_settings_fiji_a10, |
128 | ARRAY_SIZE(golden_settings_fiji_a10)); | 128 | ARRAY_SIZE(golden_settings_fiji_a10)); |
129 | break; | 129 | break; |
130 | case CHIP_TONGA: | 130 | case CHIP_TONGA: |
131 | amdgpu_program_register_sequence(adev, | 131 | amdgpu_device_program_register_sequence(adev, |
132 | tonga_mgcg_cgcg_init, | 132 | tonga_mgcg_cgcg_init, |
133 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); | 133 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); |
134 | amdgpu_program_register_sequence(adev, | 134 | amdgpu_device_program_register_sequence(adev, |
135 | golden_settings_tonga_a11, | 135 | golden_settings_tonga_a11, |
136 | ARRAY_SIZE(golden_settings_tonga_a11)); | 136 | ARRAY_SIZE(golden_settings_tonga_a11)); |
137 | break; | 137 | break; |
138 | case CHIP_POLARIS11: | 138 | case CHIP_POLARIS11: |
139 | case CHIP_POLARIS12: | 139 | case CHIP_POLARIS12: |
140 | amdgpu_program_register_sequence(adev, | 140 | amdgpu_device_program_register_sequence(adev, |
141 | golden_settings_polaris11_a11, | 141 | golden_settings_polaris11_a11, |
142 | ARRAY_SIZE(golden_settings_polaris11_a11)); | 142 | ARRAY_SIZE(golden_settings_polaris11_a11)); |
143 | break; | 143 | break; |
144 | case CHIP_POLARIS10: | 144 | case CHIP_POLARIS10: |
145 | amdgpu_program_register_sequence(adev, | 145 | amdgpu_device_program_register_sequence(adev, |
146 | golden_settings_polaris10_a11, | 146 | golden_settings_polaris10_a11, |
147 | ARRAY_SIZE(golden_settings_polaris10_a11)); | 147 | ARRAY_SIZE(golden_settings_polaris10_a11)); |
148 | break; | 148 | break; |
149 | case CHIP_CARRIZO: | 149 | case CHIP_CARRIZO: |
150 | amdgpu_program_register_sequence(adev, | 150 | amdgpu_device_program_register_sequence(adev, |
151 | cz_mgcg_cgcg_init, | 151 | cz_mgcg_cgcg_init, |
152 | ARRAY_SIZE(cz_mgcg_cgcg_init)); | 152 | ARRAY_SIZE(cz_mgcg_cgcg_init)); |
153 | break; | 153 | break; |
154 | case CHIP_STONEY: | 154 | case CHIP_STONEY: |
155 | amdgpu_program_register_sequence(adev, | 155 | amdgpu_device_program_register_sequence(adev, |
156 | stoney_mgcg_cgcg_init, | 156 | stoney_mgcg_cgcg_init, |
157 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); | 157 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); |
158 | amdgpu_program_register_sequence(adev, | 158 | amdgpu_device_program_register_sequence(adev, |
159 | golden_settings_stoney_common, | 159 | golden_settings_stoney_common, |
160 | ARRAY_SIZE(golden_settings_stoney_common)); | 160 | ARRAY_SIZE(golden_settings_stoney_common)); |
161 | break; | 161 | break; |
162 | default: | 162 | default: |
163 | break; | 163 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 5da2272bd313..899ffe50cb50 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | |||
@@ -918,9 +918,9 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) | |||
918 | bool value; | 918 | bool value; |
919 | u32 tmp; | 919 | u32 tmp; |
920 | 920 | ||
921 | amdgpu_program_register_sequence(adev, | 921 | amdgpu_device_program_register_sequence(adev, |
922 | golden_settings_vega10_hdp, | 922 | golden_settings_vega10_hdp, |
923 | ARRAY_SIZE(golden_settings_vega10_hdp)); | 923 | ARRAY_SIZE(golden_settings_vega10_hdp)); |
924 | 924 | ||
925 | if (adev->gart.robj == NULL) { | 925 | if (adev->gart.robj == NULL) { |
926 | dev_err(adev->dev, "No VRAM object for PCIE GART.\n"); | 926 | dev_err(adev->dev, "No VRAM object for PCIE GART.\n"); |
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c index da7c261d5d87..af2d47e9abdc 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | |||
@@ -279,32 +279,32 @@ void xgpu_vi_init_golden_registers(struct amdgpu_device *adev) | |||
279 | { | 279 | { |
280 | switch (adev->asic_type) { | 280 | switch (adev->asic_type) { |
281 | case CHIP_FIJI: | 281 | case CHIP_FIJI: |
282 | amdgpu_program_register_sequence(adev, | 282 | amdgpu_device_program_register_sequence(adev, |
283 | xgpu_fiji_mgcg_cgcg_init, | 283 | xgpu_fiji_mgcg_cgcg_init, |
284 | ARRAY_SIZE( | 284 | ARRAY_SIZE( |
285 | xgpu_fiji_mgcg_cgcg_init)); | 285 | xgpu_fiji_mgcg_cgcg_init)); |
286 | amdgpu_program_register_sequence(adev, | 286 | amdgpu_device_program_register_sequence(adev, |
287 | xgpu_fiji_golden_settings_a10, | 287 | xgpu_fiji_golden_settings_a10, |
288 | ARRAY_SIZE( | 288 | ARRAY_SIZE( |
289 | xgpu_fiji_golden_settings_a10)); | 289 | xgpu_fiji_golden_settings_a10)); |
290 | amdgpu_program_register_sequence(adev, | 290 | amdgpu_device_program_register_sequence(adev, |
291 | xgpu_fiji_golden_common_all, | 291 | xgpu_fiji_golden_common_all, |
292 | ARRAY_SIZE( | 292 | ARRAY_SIZE( |
293 | xgpu_fiji_golden_common_all)); | 293 | xgpu_fiji_golden_common_all)); |
294 | break; | 294 | break; |
295 | case CHIP_TONGA: | 295 | case CHIP_TONGA: |
296 | amdgpu_program_register_sequence(adev, | 296 | amdgpu_device_program_register_sequence(adev, |
297 | xgpu_tonga_mgcg_cgcg_init, | 297 | xgpu_tonga_mgcg_cgcg_init, |
298 | ARRAY_SIZE( | 298 | ARRAY_SIZE( |
299 | xgpu_tonga_mgcg_cgcg_init)); | 299 | xgpu_tonga_mgcg_cgcg_init)); |
300 | amdgpu_program_register_sequence(adev, | 300 | amdgpu_device_program_register_sequence(adev, |
301 | xgpu_tonga_golden_settings_a11, | 301 | xgpu_tonga_golden_settings_a11, |
302 | ARRAY_SIZE( | 302 | ARRAY_SIZE( |
303 | xgpu_tonga_golden_settings_a11)); | 303 | xgpu_tonga_golden_settings_a11)); |
304 | amdgpu_program_register_sequence(adev, | 304 | amdgpu_device_program_register_sequence(adev, |
305 | xgpu_tonga_golden_common_all, | 305 | xgpu_tonga_golden_common_all, |
306 | ARRAY_SIZE( | 306 | ARRAY_SIZE( |
307 | xgpu_tonga_golden_common_all)); | 307 | xgpu_tonga_golden_common_all)); |
308 | break; | 308 | break; |
309 | default: | 309 | default: |
310 | BUG_ON("Doesn't support chip type.\n"); | 310 | BUG_ON("Doesn't support chip type.\n"); |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index 0c5b91a40f22..401552bae7f5 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | |||
@@ -93,12 +93,12 @@ static void sdma_v2_4_init_golden_registers(struct amdgpu_device *adev) | |||
93 | { | 93 | { |
94 | switch (adev->asic_type) { | 94 | switch (adev->asic_type) { |
95 | case CHIP_TOPAZ: | 95 | case CHIP_TOPAZ: |
96 | amdgpu_program_register_sequence(adev, | 96 | amdgpu_device_program_register_sequence(adev, |
97 | iceland_mgcg_cgcg_init, | 97 | iceland_mgcg_cgcg_init, |
98 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); | 98 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); |
99 | amdgpu_program_register_sequence(adev, | 99 | amdgpu_device_program_register_sequence(adev, |
100 | golden_settings_iceland_a11, | 100 | golden_settings_iceland_a11, |
101 | ARRAY_SIZE(golden_settings_iceland_a11)); | 101 | ARRAY_SIZE(golden_settings_iceland_a11)); |
102 | break; | 102 | break; |
103 | default: | 103 | default: |
104 | break; | 104 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 4e031a2aad9d..0735d4d0e56a 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | |||
@@ -192,47 +192,47 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev) | |||
192 | { | 192 | { |
193 | switch (adev->asic_type) { | 193 | switch (adev->asic_type) { |
194 | case CHIP_FIJI: | 194 | case CHIP_FIJI: |
195 | amdgpu_program_register_sequence(adev, | 195 | amdgpu_device_program_register_sequence(adev, |
196 | fiji_mgcg_cgcg_init, | 196 | fiji_mgcg_cgcg_init, |
197 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); | 197 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); |
198 | amdgpu_program_register_sequence(adev, | 198 | amdgpu_device_program_register_sequence(adev, |
199 | golden_settings_fiji_a10, | 199 | golden_settings_fiji_a10, |
200 | ARRAY_SIZE(golden_settings_fiji_a10)); | 200 | ARRAY_SIZE(golden_settings_fiji_a10)); |
201 | break; | 201 | break; |
202 | case CHIP_TONGA: | 202 | case CHIP_TONGA: |
203 | amdgpu_program_register_sequence(adev, | 203 | amdgpu_device_program_register_sequence(adev, |
204 | tonga_mgcg_cgcg_init, | 204 | tonga_mgcg_cgcg_init, |
205 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); | 205 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); |
206 | amdgpu_program_register_sequence(adev, | 206 | amdgpu_device_program_register_sequence(adev, |
207 | golden_settings_tonga_a11, | 207 | golden_settings_tonga_a11, |
208 | ARRAY_SIZE(golden_settings_tonga_a11)); | 208 | ARRAY_SIZE(golden_settings_tonga_a11)); |
209 | break; | 209 | break; |
210 | case CHIP_POLARIS11: | 210 | case CHIP_POLARIS11: |
211 | case CHIP_POLARIS12: | 211 | case CHIP_POLARIS12: |
212 | amdgpu_program_register_sequence(adev, | 212 | amdgpu_device_program_register_sequence(adev, |
213 | golden_settings_polaris11_a11, | 213 | golden_settings_polaris11_a11, |
214 | ARRAY_SIZE(golden_settings_polaris11_a11)); | 214 | ARRAY_SIZE(golden_settings_polaris11_a11)); |
215 | break; | 215 | break; |
216 | case CHIP_POLARIS10: | 216 | case CHIP_POLARIS10: |
217 | amdgpu_program_register_sequence(adev, | 217 | amdgpu_device_program_register_sequence(adev, |
218 | golden_settings_polaris10_a11, | 218 | golden_settings_polaris10_a11, |
219 | ARRAY_SIZE(golden_settings_polaris10_a11)); | 219 | ARRAY_SIZE(golden_settings_polaris10_a11)); |
220 | break; | 220 | break; |
221 | case CHIP_CARRIZO: | 221 | case CHIP_CARRIZO: |
222 | amdgpu_program_register_sequence(adev, | 222 | amdgpu_device_program_register_sequence(adev, |
223 | cz_mgcg_cgcg_init, | 223 | cz_mgcg_cgcg_init, |
224 | ARRAY_SIZE(cz_mgcg_cgcg_init)); | 224 | ARRAY_SIZE(cz_mgcg_cgcg_init)); |
225 | amdgpu_program_register_sequence(adev, | 225 | amdgpu_device_program_register_sequence(adev, |
226 | cz_golden_settings_a11, | 226 | cz_golden_settings_a11, |
227 | ARRAY_SIZE(cz_golden_settings_a11)); | 227 | ARRAY_SIZE(cz_golden_settings_a11)); |
228 | break; | 228 | break; |
229 | case CHIP_STONEY: | 229 | case CHIP_STONEY: |
230 | amdgpu_program_register_sequence(adev, | 230 | amdgpu_device_program_register_sequence(adev, |
231 | stoney_mgcg_cgcg_init, | 231 | stoney_mgcg_cgcg_init, |
232 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); | 232 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); |
233 | amdgpu_program_register_sequence(adev, | 233 | amdgpu_device_program_register_sequence(adev, |
234 | stoney_golden_settings_a11, | 234 | stoney_golden_settings_a11, |
235 | ARRAY_SIZE(stoney_golden_settings_a11)); | 235 | ARRAY_SIZE(stoney_golden_settings_a11)); |
236 | break; | 236 | break; |
237 | default: | 237 | default: |
238 | break; | 238 | break; |
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 49eef3090f08..78baddb5d300 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c | |||
@@ -1390,65 +1390,65 @@ static void si_init_golden_registers(struct amdgpu_device *adev) | |||
1390 | { | 1390 | { |
1391 | switch (adev->asic_type) { | 1391 | switch (adev->asic_type) { |
1392 | case CHIP_TAHITI: | 1392 | case CHIP_TAHITI: |
1393 | amdgpu_program_register_sequence(adev, | 1393 | amdgpu_device_program_register_sequence(adev, |
1394 | tahiti_golden_registers, | 1394 | tahiti_golden_registers, |
1395 | ARRAY_SIZE(tahiti_golden_registers)); | 1395 | ARRAY_SIZE(tahiti_golden_registers)); |
1396 | amdgpu_program_register_sequence(adev, | 1396 | amdgpu_device_program_register_sequence(adev, |
1397 | tahiti_golden_rlc_registers, | 1397 | tahiti_golden_rlc_registers, |
1398 | ARRAY_SIZE(tahiti_golden_rlc_registers)); | 1398 | ARRAY_SIZE(tahiti_golden_rlc_registers)); |
1399 | amdgpu_program_register_sequence(adev, | 1399 | amdgpu_device_program_register_sequence(adev, |
1400 | tahiti_mgcg_cgcg_init, | 1400 | tahiti_mgcg_cgcg_init, |
1401 | ARRAY_SIZE(tahiti_mgcg_cgcg_init)); | 1401 | ARRAY_SIZE(tahiti_mgcg_cgcg_init)); |
1402 | amdgpu_program_register_sequence(adev, | 1402 | amdgpu_device_program_register_sequence(adev, |
1403 | tahiti_golden_registers2, | 1403 | tahiti_golden_registers2, |
1404 | ARRAY_SIZE(tahiti_golden_registers2)); | 1404 | ARRAY_SIZE(tahiti_golden_registers2)); |
1405 | break; | 1405 | break; |
1406 | case CHIP_PITCAIRN: | 1406 | case CHIP_PITCAIRN: |
1407 | amdgpu_program_register_sequence(adev, | 1407 | amdgpu_device_program_register_sequence(adev, |
1408 | pitcairn_golden_registers, | 1408 | pitcairn_golden_registers, |
1409 | ARRAY_SIZE(pitcairn_golden_registers)); | 1409 | ARRAY_SIZE(pitcairn_golden_registers)); |
1410 | amdgpu_program_register_sequence(adev, | 1410 | amdgpu_device_program_register_sequence(adev, |
1411 | pitcairn_golden_rlc_registers, | 1411 | pitcairn_golden_rlc_registers, |
1412 | ARRAY_SIZE(pitcairn_golden_rlc_registers)); | 1412 | ARRAY_SIZE(pitcairn_golden_rlc_registers)); |
1413 | amdgpu_program_register_sequence(adev, | 1413 | amdgpu_device_program_register_sequence(adev, |
1414 | pitcairn_mgcg_cgcg_init, | 1414 | pitcairn_mgcg_cgcg_init, |
1415 | ARRAY_SIZE(pitcairn_mgcg_cgcg_init)); | 1415 | ARRAY_SIZE(pitcairn_mgcg_cgcg_init)); |
1416 | break; | 1416 | break; |
1417 | case CHIP_VERDE: | 1417 | case CHIP_VERDE: |
1418 | amdgpu_program_register_sequence(adev, | 1418 | amdgpu_device_program_register_sequence(adev, |
1419 | verde_golden_registers, | 1419 | verde_golden_registers, |
1420 | ARRAY_SIZE(verde_golden_registers)); | 1420 | ARRAY_SIZE(verde_golden_registers)); |
1421 | amdgpu_program_register_sequence(adev, | 1421 | amdgpu_device_program_register_sequence(adev, |
1422 | verde_golden_rlc_registers, | 1422 | verde_golden_rlc_registers, |
1423 | ARRAY_SIZE(verde_golden_rlc_registers)); | 1423 | ARRAY_SIZE(verde_golden_rlc_registers)); |
1424 | amdgpu_program_register_sequence(adev, | 1424 | amdgpu_device_program_register_sequence(adev, |
1425 | verde_mgcg_cgcg_init, | 1425 | verde_mgcg_cgcg_init, |
1426 | ARRAY_SIZE(verde_mgcg_cgcg_init)); | 1426 | ARRAY_SIZE(verde_mgcg_cgcg_init)); |
1427 | amdgpu_program_register_sequence(adev, | 1427 | amdgpu_device_program_register_sequence(adev, |
1428 | verde_pg_init, | 1428 | verde_pg_init, |
1429 | ARRAY_SIZE(verde_pg_init)); | 1429 | ARRAY_SIZE(verde_pg_init)); |
1430 | break; | 1430 | break; |
1431 | case CHIP_OLAND: | 1431 | case CHIP_OLAND: |
1432 | amdgpu_program_register_sequence(adev, | 1432 | amdgpu_device_program_register_sequence(adev, |
1433 | oland_golden_registers, | 1433 | oland_golden_registers, |
1434 | ARRAY_SIZE(oland_golden_registers)); | 1434 | ARRAY_SIZE(oland_golden_registers)); |
1435 | amdgpu_program_register_sequence(adev, | 1435 | amdgpu_device_program_register_sequence(adev, |
1436 | oland_golden_rlc_registers, | 1436 | oland_golden_rlc_registers, |
1437 | ARRAY_SIZE(oland_golden_rlc_registers)); | 1437 | ARRAY_SIZE(oland_golden_rlc_registers)); |
1438 | amdgpu_program_register_sequence(adev, | 1438 | amdgpu_device_program_register_sequence(adev, |
1439 | oland_mgcg_cgcg_init, | 1439 | oland_mgcg_cgcg_init, |
1440 | ARRAY_SIZE(oland_mgcg_cgcg_init)); | 1440 | ARRAY_SIZE(oland_mgcg_cgcg_init)); |
1441 | break; | 1441 | break; |
1442 | case CHIP_HAINAN: | 1442 | case CHIP_HAINAN: |
1443 | amdgpu_program_register_sequence(adev, | 1443 | amdgpu_device_program_register_sequence(adev, |
1444 | hainan_golden_registers, | 1444 | hainan_golden_registers, |
1445 | ARRAY_SIZE(hainan_golden_registers)); | 1445 | ARRAY_SIZE(hainan_golden_registers)); |
1446 | amdgpu_program_register_sequence(adev, | 1446 | amdgpu_device_program_register_sequence(adev, |
1447 | hainan_golden_registers2, | 1447 | hainan_golden_registers2, |
1448 | ARRAY_SIZE(hainan_golden_registers2)); | 1448 | ARRAY_SIZE(hainan_golden_registers2)); |
1449 | amdgpu_program_register_sequence(adev, | 1449 | amdgpu_device_program_register_sequence(adev, |
1450 | hainan_mgcg_cgcg_init, | 1450 | hainan_mgcg_cgcg_init, |
1451 | ARRAY_SIZE(hainan_mgcg_cgcg_init)); | 1451 | ARRAY_SIZE(hainan_mgcg_cgcg_init)); |
1452 | break; | 1452 | break; |
1453 | 1453 | ||
1454 | 1454 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index bb8ca9489546..0b57c5d24510 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c | |||
@@ -282,29 +282,29 @@ static void vi_init_golden_registers(struct amdgpu_device *adev) | |||
282 | 282 | ||
283 | switch (adev->asic_type) { | 283 | switch (adev->asic_type) { |
284 | case CHIP_TOPAZ: | 284 | case CHIP_TOPAZ: |
285 | amdgpu_program_register_sequence(adev, | 285 | amdgpu_device_program_register_sequence(adev, |
286 | iceland_mgcg_cgcg_init, | 286 | iceland_mgcg_cgcg_init, |
287 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); | 287 | ARRAY_SIZE(iceland_mgcg_cgcg_init)); |
288 | break; | 288 | break; |
289 | case CHIP_FIJI: | 289 | case CHIP_FIJI: |
290 | amdgpu_program_register_sequence(adev, | 290 | amdgpu_device_program_register_sequence(adev, |
291 | fiji_mgcg_cgcg_init, | 291 | fiji_mgcg_cgcg_init, |
292 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); | 292 | ARRAY_SIZE(fiji_mgcg_cgcg_init)); |
293 | break; | 293 | break; |
294 | case CHIP_TONGA: | 294 | case CHIP_TONGA: |
295 | amdgpu_program_register_sequence(adev, | 295 | amdgpu_device_program_register_sequence(adev, |
296 | tonga_mgcg_cgcg_init, | 296 | tonga_mgcg_cgcg_init, |
297 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); | 297 | ARRAY_SIZE(tonga_mgcg_cgcg_init)); |
298 | break; | 298 | break; |
299 | case CHIP_CARRIZO: | 299 | case CHIP_CARRIZO: |
300 | amdgpu_program_register_sequence(adev, | 300 | amdgpu_device_program_register_sequence(adev, |
301 | cz_mgcg_cgcg_init, | 301 | cz_mgcg_cgcg_init, |
302 | ARRAY_SIZE(cz_mgcg_cgcg_init)); | 302 | ARRAY_SIZE(cz_mgcg_cgcg_init)); |
303 | break; | 303 | break; |
304 | case CHIP_STONEY: | 304 | case CHIP_STONEY: |
305 | amdgpu_program_register_sequence(adev, | 305 | amdgpu_device_program_register_sequence(adev, |
306 | stoney_mgcg_cgcg_init, | 306 | stoney_mgcg_cgcg_init, |
307 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); | 307 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); |
308 | break; | 308 | break; |
309 | case CHIP_POLARIS11: | 309 | case CHIP_POLARIS11: |
310 | case CHIP_POLARIS10: | 310 | case CHIP_POLARIS10: |