Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu: clean the dummy wait_for_idle functions

Remove the dummy wait_for_idle functions for all
ip blocks.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Sunil Khatri and committed by
Alex Deucher
f13c7da1 aa980de3

+1 -96
-6
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
··· 584 584 return true; 585 585 } 586 586 587 - static int acp_wait_for_idle(struct amdgpu_ip_block *ip_block) 588 - { 589 - return 0; 590 - } 591 - 592 587 static int acp_soft_reset(struct amdgpu_ip_block *ip_block) 593 588 { 594 589 return 0; ··· 617 622 .suspend = acp_suspend, 618 623 .resume = acp_resume, 619 624 .is_idle = acp_is_idle, 620 - .wait_for_idle = acp_wait_for_idle, 621 625 .soft_reset = acp_soft_reset, 622 626 .set_clockgating_state = acp_set_clockgating_state, 623 627 .set_powergating_state = acp_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
··· 128 128 return true; 129 129 } 130 130 131 - static int isp_wait_for_idle(struct amdgpu_ip_block *ip_block) 132 - { 133 - return 0; 134 - } 135 - 136 131 static int isp_soft_reset(struct amdgpu_ip_block *ip_block) 137 132 { 138 133 return 0; ··· 152 157 .hw_init = isp_hw_init, 153 158 .hw_fini = isp_hw_fini, 154 159 .is_idle = isp_is_idle, 155 - .wait_for_idle = isp_wait_for_idle, 156 160 .soft_reset = isp_soft_reset, 157 161 .set_clockgating_state = isp_set_clockgating_state, 158 162 .set_powergating_state = isp_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
··· 632 632 return true; 633 633 } 634 634 635 - static int amdgpu_vkms_wait_for_idle(struct amdgpu_ip_block *ip_block) 636 - { 637 - return 0; 638 - } 639 - 640 635 static int amdgpu_vkms_soft_reset(struct amdgpu_ip_block *ip_block) 641 636 { 642 637 return 0; ··· 660 665 .suspend = amdgpu_vkms_suspend, 661 666 .resume = amdgpu_vkms_resume, 662 667 .is_idle = amdgpu_vkms_is_idle, 663 - .wait_for_idle = amdgpu_vkms_wait_for_idle, 664 668 .soft_reset = amdgpu_vkms_soft_reset, 665 669 .set_clockgating_state = amdgpu_vkms_set_clockgating_state, 666 670 .set_powergating_state = amdgpu_vkms_set_powergating_state,
+1 -5
drivers/gpu/drm/amd/amdgpu/cik.c
··· 2153 2153 return true; 2154 2154 } 2155 2155 2156 - static int cik_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 2157 - { 2158 - return 0; 2159 - } 2156 + 2160 2157 2161 2158 static int cik_common_soft_reset(struct amdgpu_ip_block *ip_block) 2162 2159 { ··· 2181 2184 .hw_fini = cik_common_hw_fini, 2182 2185 .resume = cik_common_resume, 2183 2186 .is_idle = cik_common_is_idle, 2184 - .wait_for_idle = cik_common_wait_for_idle, 2185 2187 .soft_reset = cik_common_soft_reset, 2186 2188 .set_clockgating_state = cik_common_set_clockgating_state, 2187 2189 .set_powergating_state = cik_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2948 2948 return true; 2949 2949 } 2950 2950 2951 - static int dce_v10_0_wait_for_idle(struct amdgpu_ip_block *ip_block) 2952 - { 2953 - return 0; 2954 - } 2955 - 2956 2951 static bool dce_v10_0_check_soft_reset(struct amdgpu_ip_block *ip_block) 2957 2952 { 2958 2953 struct amdgpu_device *adev = ip_block->adev; ··· 3325 3330 .suspend = dce_v10_0_suspend, 3326 3331 .resume = dce_v10_0_resume, 3327 3332 .is_idle = dce_v10_0_is_idle, 3328 - .wait_for_idle = dce_v10_0_wait_for_idle, 3329 3333 .check_soft_reset = dce_v10_0_check_soft_reset, 3330 3334 .soft_reset = dce_v10_0_soft_reset, 3331 3335 .set_clockgating_state = dce_v10_0_set_clockgating_state,
-6
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 3086 3086 return true; 3087 3087 } 3088 3088 3089 - static int dce_v11_0_wait_for_idle(struct amdgpu_ip_block *ip_block) 3090 - { 3091 - return 0; 3092 - } 3093 - 3094 3089 static int dce_v11_0_soft_reset(struct amdgpu_ip_block *ip_block) 3095 3090 { 3096 3091 u32 srbm_soft_reset = 0, tmp; ··· 3457 3462 .suspend = dce_v11_0_suspend, 3458 3463 .resume = dce_v11_0_resume, 3459 3464 .is_idle = dce_v11_0_is_idle, 3460 - .wait_for_idle = dce_v11_0_wait_for_idle, 3461 3465 .soft_reset = dce_v11_0_soft_reset, 3462 3466 .set_clockgating_state = dce_v11_0_set_clockgating_state, 3463 3467 .set_powergating_state = dce_v11_0_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
··· 2843 2843 return true; 2844 2844 } 2845 2845 2846 - static int dce_v6_0_wait_for_idle(struct amdgpu_ip_block *ip_block) 2847 - { 2848 - return 0; 2849 - } 2850 - 2851 2846 static int dce_v6_0_soft_reset(struct amdgpu_ip_block *ip_block) 2852 2847 { 2853 2848 DRM_INFO("xxxx: dce_v6_0_soft_reset --- no impl!!\n"); ··· 3147 3152 .suspend = dce_v6_0_suspend, 3148 3153 .resume = dce_v6_0_resume, 3149 3154 .is_idle = dce_v6_0_is_idle, 3150 - .wait_for_idle = dce_v6_0_wait_for_idle, 3151 3155 .soft_reset = dce_v6_0_soft_reset, 3152 3156 .set_clockgating_state = dce_v6_0_set_clockgating_state, 3153 3157 .set_powergating_state = dce_v6_0_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2866 2866 return true; 2867 2867 } 2868 2868 2869 - static int dce_v8_0_wait_for_idle(struct amdgpu_ip_block *ip_block) 2870 - { 2871 - return 0; 2872 - } 2873 - 2874 2869 static int dce_v8_0_soft_reset(struct amdgpu_ip_block *ip_block) 2875 2870 { 2876 2871 u32 srbm_soft_reset = 0, tmp; ··· 3235 3240 .suspend = dce_v8_0_suspend, 3236 3241 .resume = dce_v8_0_resume, 3237 3242 .is_idle = dce_v8_0_is_idle, 3238 - .wait_for_idle = dce_v8_0_wait_for_idle, 3239 3243 .soft_reset = dce_v8_0_soft_reset, 3240 3244 .set_clockgating_state = dce_v8_0_set_clockgating_state, 3241 3245 .set_powergating_state = dce_v8_0_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/nv.c
··· 1039 1039 return true; 1040 1040 } 1041 1041 1042 - static int nv_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 1043 - { 1044 - return 0; 1045 - } 1046 - 1047 1042 static int nv_common_soft_reset(struct amdgpu_ip_block *ip_block) 1048 1043 { 1049 1044 return 0; ··· 1106 1111 .suspend = nv_common_suspend, 1107 1112 .resume = nv_common_resume, 1108 1113 .is_idle = nv_common_is_idle, 1109 - .wait_for_idle = nv_common_wait_for_idle, 1110 1114 .soft_reset = nv_common_soft_reset, 1111 1115 .set_clockgating_state = nv_common_set_clockgating_state, 1112 1116 .set_powergating_state = nv_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/si.c
··· 2649 2649 return true; 2650 2650 } 2651 2651 2652 - static int si_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 2653 - { 2654 - return 0; 2655 - } 2656 - 2657 2652 static int si_common_soft_reset(struct amdgpu_ip_block *ip_block) 2658 2653 { 2659 2654 return 0; ··· 2674 2679 .hw_fini = si_common_hw_fini, 2675 2680 .resume = si_common_resume, 2676 2681 .is_idle = si_common_is_idle, 2677 - .wait_for_idle = si_common_wait_for_idle, 2678 2682 .soft_reset = si_common_soft_reset, 2679 2683 .set_clockgating_state = si_common_set_clockgating_state, 2680 2684 .set_powergating_state = si_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/soc15.c
··· 1341 1341 return true; 1342 1342 } 1343 1343 1344 - static int soc15_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 1345 - { 1346 - return 0; 1347 - } 1348 - 1349 1344 static int soc15_common_soft_reset(struct amdgpu_ip_block *ip_block) 1350 1345 { 1351 1346 return 0; ··· 1496 1501 .suspend = soc15_common_suspend, 1497 1502 .resume = soc15_common_resume, 1498 1503 .is_idle = soc15_common_is_idle, 1499 - .wait_for_idle = soc15_common_wait_for_idle, 1500 1504 .soft_reset = soc15_common_soft_reset, 1501 1505 .set_clockgating_state = soc15_common_set_clockgating_state, 1502 1506 .set_powergating_state = soc15_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/soc21.c
··· 927 927 return true; 928 928 } 929 929 930 - static int soc21_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 931 - { 932 - return 0; 933 - } 934 - 935 930 static int soc21_common_soft_reset(struct amdgpu_ip_block *ip_block) 936 931 { 937 932 return 0; ··· 995 1000 .suspend = soc21_common_suspend, 996 1001 .resume = soc21_common_resume, 997 1002 .is_idle = soc21_common_is_idle, 998 - .wait_for_idle = soc21_common_wait_for_idle, 999 1003 .soft_reset = soc21_common_soft_reset, 1000 1004 .set_clockgating_state = soc21_common_set_clockgating_state, 1001 1005 .set_powergating_state = soc21_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/soc24.c
··· 522 522 return true; 523 523 } 524 524 525 - static int soc24_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 526 - { 527 - return 0; 528 - } 529 - 530 525 static int soc24_common_soft_reset(struct amdgpu_ip_block *ip_block) 531 526 { 532 527 return 0; ··· 586 591 .suspend = soc24_common_suspend, 587 592 .resume = soc24_common_resume, 588 593 .is_idle = soc24_common_is_idle, 589 - .wait_for_idle = soc24_common_wait_for_idle, 590 594 .soft_reset = soc24_common_soft_reset, 591 595 .set_clockgating_state = soc24_common_set_clockgating_state, 592 596 .set_powergating_state = soc24_common_set_powergating_state,
-6
drivers/gpu/drm/amd/amdgpu/vi.c
··· 1741 1741 return true; 1742 1742 } 1743 1743 1744 - static int vi_common_wait_for_idle(struct amdgpu_ip_block *ip_block) 1745 - { 1746 - return 0; 1747 - } 1748 - 1749 1744 static int vi_common_soft_reset(struct amdgpu_ip_block *ip_block) 1750 1745 { 1751 1746 return 0; ··· 2038 2043 .suspend = vi_common_suspend, 2039 2044 .resume = vi_common_resume, 2040 2045 .is_idle = vi_common_is_idle, 2041 - .wait_for_idle = vi_common_wait_for_idle, 2042 2046 .soft_reset = vi_common_soft_reset, 2043 2047 .set_clockgating_state = vi_common_set_clockgating_state, 2044 2048 .set_powergating_state = vi_common_set_powergating_state,
-7
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
··· 3099 3099 return true; 3100 3100 } 3101 3101 3102 - static int kv_dpm_wait_for_idle(struct amdgpu_ip_block *ip_block) 3103 - { 3104 - return 0; 3105 - } 3106 - 3107 - 3108 3102 static int kv_dpm_soft_reset(struct amdgpu_ip_block *ip_block) 3109 3103 { 3110 3104 return 0; ··· 3307 3313 .suspend = kv_dpm_suspend, 3308 3314 .resume = kv_dpm_resume, 3309 3315 .is_idle = kv_dpm_is_idle, 3310 - .wait_for_idle = kv_dpm_wait_for_idle, 3311 3316 .soft_reset = kv_dpm_soft_reset, 3312 3317 .set_clockgating_state = kv_dpm_set_clockgating_state, 3313 3318 .set_powergating_state = kv_dpm_set_powergating_state,
-6
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
··· 244 244 return false; 245 245 } 246 246 247 - static int pp_wait_for_idle(struct amdgpu_ip_block *ip_block) 248 - { 249 - return 0; 250 - } 251 - 252 247 static int pp_sw_reset(struct amdgpu_ip_block *ip_block) 253 248 { 254 249 return 0; ··· 290 295 .suspend = pp_suspend, 291 296 .resume = pp_resume, 292 297 .is_idle = pp_is_idle, 293 - .wait_for_idle = pp_wait_for_idle, 294 298 .soft_reset = pp_sw_reset, 295 299 .set_clockgating_state = pp_set_clockgating_state, 296 300 .set_powergating_state = pp_set_powergating_state,