Skip to content

Commit 8d5e70b

Browse files
EmilyDeng666alexdeucher
authored andcommitted
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>
1 parent 15030ae commit 8d5e70b

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val)
19901990
uint32_t max_freq, min_freq;
19911991
struct amdgpu_device *adev = (struct amdgpu_device *)data;
19921992

1993-
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
1993+
if (amdgpu_sriov_multi_vf_mode(adev))
19941994
return -EINVAL;
19951995

19961996
ret = pm_runtime_get_sync(adev_to_drm(adev)->dev);

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,8 @@ static inline bool is_virtual_machine(void)
364364

365365
#define amdgpu_sriov_is_pp_one_vf(adev) \
366366
((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))
367369
#define amdgpu_sriov_is_debug(adev) \
368370
((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug)
369371
#define amdgpu_sriov_is_normal(adev) \

drivers/gpu/drm/amd/pm/amdgpu_pm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ static int pp_od_clk_voltage_attr_update(struct amdgpu_device *adev, struct amdg
19361936
if (gc_ver == IP_VERSION(9, 4, 3) ||
19371937
gc_ver == IP_VERSION(9, 4, 4) ||
19381938
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))
19401940
*states = ATTR_STATE_UNSUPPORTED;
19411941
return 0;
19421942
}
@@ -1971,7 +1971,7 @@ static int pp_dpm_dcefclk_attr_update(struct amdgpu_device *adev, struct amdgpu_
19711971
* setting should not be allowed from VF if not in one VF mode.
19721972
*/
19731973
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))) {
19751975
dev_attr->attr.mode &= ~S_IWUGO;
19761976
dev_attr->store = NULL;
19771977
}

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,7 @@ static int smu_hw_init(struct amdgpu_ip_block *ip_block)
18141814
struct amdgpu_device *adev = ip_block->adev;
18151815
struct smu_context *smu = adev->powerplay.pp_handle;
18161816

1817-
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) {
1817+
if (amdgpu_sriov_multi_vf_mode(adev)) {
18181818
smu->pm_enabled = false;
18191819
return 0;
18201820
}
@@ -2038,7 +2038,7 @@ static int smu_hw_fini(struct amdgpu_ip_block *ip_block)
20382038
struct smu_context *smu = adev->powerplay.pp_handle;
20392039
int i, ret;
20402040

2041-
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
2041+
if (amdgpu_sriov_multi_vf_mode(adev))
20422042
return 0;
20432043

20442044
for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
@@ -2106,7 +2106,7 @@ static int smu_suspend(struct amdgpu_ip_block *ip_block)
21062106
int ret;
21072107
uint64_t count;
21082108

2109-
if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
2109+
if (amdgpu_sriov_multi_vf_mode(adev))
21102110
return 0;
21112111

21122112
if (!smu->pm_enabled)
@@ -2142,7 +2142,7 @@ static int smu_resume(struct amdgpu_ip_block *ip_block)
21422142
struct amdgpu_device *adev = ip_block->adev;
21432143
struct smu_context *smu = adev->powerplay.pp_handle;
21442144

2145-
if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
2145+
if (amdgpu_sriov_multi_vf_mode(adev))
21462146
return 0;
21472147

21482148
if (!smu->pm_enabled)

0 commit comments

Comments
 (0)