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 suspend functions

Remove the dummy suspend 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
aa980de3 fbcd0ad5

+2 -19
-6
drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
··· 66 66 return -ENODEV; 67 67 } 68 68 69 - static int isp_suspend(struct amdgpu_ip_block *ip_block) 70 - { 71 - return 0; 72 - } 73 - 74 69 static int isp_load_fw_by_psp(struct amdgpu_device *adev) 75 70 { 76 71 const struct common_firmware_header *hdr; ··· 156 161 .late_init = NULL, 157 162 .hw_init = isp_hw_init, 158 163 .hw_fini = isp_hw_fini, 159 - .suspend = isp_suspend, 160 164 .is_idle = isp_is_idle, 161 165 .wait_for_idle = isp_wait_for_idle, 162 166 .soft_reset = isp_soft_reset,
+2 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
··· 613 613 r = drm_mode_config_helper_suspend(adev_to_drm(adev)); 614 614 if (r) 615 615 return r; 616 - return amdgpu_vkms_hw_fini(ip_block); 616 + 617 + return 0; 617 618 } 618 619 619 620 static int amdgpu_vkms_resume(struct amdgpu_ip_block *ip_block)
-6
drivers/gpu/drm/amd/amdgpu/cik.c
··· 2143 2143 return 0; 2144 2144 } 2145 2145 2146 - static int cik_common_suspend(struct amdgpu_ip_block *ip_block) 2147 - { 2148 - return cik_common_hw_fini(ip_block); 2149 - } 2150 - 2151 2146 static int cik_common_resume(struct amdgpu_ip_block *ip_block) 2152 2147 { 2153 2148 return cik_common_hw_init(ip_block); ··· 2182 2187 .late_init = NULL, 2183 2188 .hw_init = cik_common_hw_init, 2184 2189 .hw_fini = cik_common_hw_fini, 2185 - .suspend = cik_common_suspend, 2186 2190 .resume = cik_common_resume, 2187 2191 .is_idle = cik_common_is_idle, 2188 2192 .wait_for_idle = cik_common_wait_for_idle,
-6
drivers/gpu/drm/amd/amdgpu/si.c
··· 2639 2639 return 0; 2640 2640 } 2641 2641 2642 - static int si_common_suspend(struct amdgpu_ip_block *ip_block) 2643 - { 2644 - return si_common_hw_fini(ip_block); 2645 - } 2646 - 2647 2642 static int si_common_resume(struct amdgpu_ip_block *ip_block) 2648 2643 { 2649 2644 return si_common_hw_init(ip_block); ··· 2677 2682 .late_init = NULL, 2678 2683 .hw_init = si_common_hw_init, 2679 2684 .hw_fini = si_common_hw_fini, 2680 - .suspend = si_common_suspend, 2681 2685 .resume = si_common_resume, 2682 2686 .is_idle = si_common_is_idle, 2683 2687 .wait_for_idle = si_common_wait_for_idle,