tjh.dev / kernel
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: Add amdgpu_sriov_multi_vf_mode function

Use amdgpu_sriov_multi_vf_mode to replace amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev).

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Emily Deng and committed by
Alex Deucher 8d5e70ba 15030aee

+9 -7
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
··· 1990 1990 uint32_t max_freq, min_freq; 1991 1991 struct amdgpu_device *adev = (struct amdgpu_device *)data; 1992 1992 1993 - if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) 1993 + if (amdgpu_sriov_multi_vf_mode(adev)) 1994 1994 return -EINVAL; 1995 1995 1996 1996 ret = pm_runtime_get_sync(adev_to_drm(adev)->dev);
+2
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
··· 364 364 365 365 #define amdgpu_sriov_is_pp_one_vf(adev) \ 366 366 ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) 367 + #define amdgpu_sriov_multi_vf_mode(adev) \ 368 + (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) 367 369 #define amdgpu_sriov_is_debug(adev) \ 368 370 ((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug) 369 371 #define amdgpu_sriov_is_normal(adev) \
+2 -2
drivers/gpu/drm/amd/pm/amdgpu_pm.c
··· 1936 1936 if (gc_ver == IP_VERSION(9, 4, 3) || 1937 1937 gc_ver == IP_VERSION(9, 4, 4) || 1938 1938 gc_ver == IP_VERSION(9, 5, 0)) { 1939 - if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) 1939 + if (amdgpu_sriov_multi_vf_mode(adev)) 1940 1940 *states = ATTR_STATE_UNSUPPORTED; 1941 1941 return 0; 1942 1942 } ··· 1971 1971 * setting should not be allowed from VF if not in one VF mode. 1972 1972 */ 1973 1973 if (gc_ver >= IP_VERSION(10, 0, 0) || 1974 - (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))) { 1974 + (amdgpu_sriov_multi_vf_mode(adev))) { 1975 1975 dev_attr->attr.mode &= ~S_IWUGO; 1976 1976 dev_attr->store = NULL; 1977 1977 }
+4 -4
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
··· 1814 1814 struct amdgpu_device *adev = ip_block->adev; 1815 1815 struct smu_context *smu = adev->powerplay.pp_handle; 1816 1816 1817 - if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) { 1817 + if (amdgpu_sriov_multi_vf_mode(adev)) { 1818 1818 smu->pm_enabled = false; 1819 1819 return 0; 1820 1820 } ··· 2038 2038 struct smu_context *smu = adev->powerplay.pp_handle; 2039 2039 int i, ret; 2040 2040 2041 - if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) 2041 + if (amdgpu_sriov_multi_vf_mode(adev)) 2042 2042 return 0; 2043 2043 2044 2044 for (i = 0; i < adev->vcn.num_vcn_inst; i++) { ··· 2106 2106 int ret; 2107 2107 uint64_t count; 2108 2108 2109 - if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) 2109 + if (amdgpu_sriov_multi_vf_mode(adev)) 2110 2110 return 0; 2111 2111 2112 2112 if (!smu->pm_enabled) ··· 2142 2142 struct amdgpu_device *adev = ip_block->adev; 2143 2143 struct smu_context *smu = adev->powerplay.pp_handle; 2144 2144 2145 - if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev)) 2145 + if (amdgpu_sriov_multi_vf_mode(adev)) 2146 2146 return 0; 2147 2147 2148 2148 if (!smu->pm_enabled)