Commit 8d5e70ba authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

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: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 15030aee

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

+1 −1
Original line number Diff line number Diff line
@@ -1990,7 +1990,7 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val) 
	uint32_t max_freq, min_freq;

	struct amdgpu_device *adev = (struct amdgpu_device *)data;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

	if (amdgpu_sriov_multi_vf_mode(adev))

		return -EINVAL;



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

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

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ static inline bool is_virtual_machine(void) 


#define amdgpu_sriov_is_pp_one_vf(adev) \

	((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF)

#define amdgpu_sriov_multi_vf_mode(adev) \

	(amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

#define amdgpu_sriov_is_debug(adev) \

	((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug)

#define amdgpu_sriov_is_normal(adev) \

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

+2 −2
Original line number Diff line number Diff line
@@ -1936,7 +1936,7 @@ static int pp_od_clk_voltage_attr_update(struct amdgpu_device *adev, struct amdg 
	if (gc_ver == IP_VERSION(9, 4, 3) ||

	    gc_ver == IP_VERSION(9, 4, 4) ||

	    gc_ver == IP_VERSION(9, 5, 0)) {

		if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		if (amdgpu_sriov_multi_vf_mode(adev))

			*states = ATTR_STATE_UNSUPPORTED;

		return 0;

	}
@@ -1971,7 +1971,7 @@ static int pp_dpm_dcefclk_attr_update(struct amdgpu_device *adev, struct amdgpu_ 
	 * setting should not be allowed from VF if not in one VF mode.

	 */

	if (gc_ver >= IP_VERSION(10, 0, 0) ||

	    (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))) {

	    (amdgpu_sriov_multi_vf_mode(adev))) {

		dev_attr->attr.mode &= ~S_IWUGO;

		dev_attr->store = NULL;

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ static int smu_hw_init(struct amdgpu_ip_block *ip_block) 
	struct amdgpu_device *adev = ip_block->adev;

	struct smu_context *smu = adev->powerplay.pp_handle;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev)) {

	if (amdgpu_sriov_multi_vf_mode(adev)) {

		smu->pm_enabled = false;

		return 0;

	}
@@ -2038,7 +2038,7 @@ static int smu_hw_fini(struct amdgpu_ip_block *ip_block) 
	struct smu_context *smu = adev->powerplay.pp_handle;

	int i, ret;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

	if (amdgpu_sriov_multi_vf_mode(adev))

		return 0;



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

	uint64_t count;



	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

	if (amdgpu_sriov_multi_vf_mode(adev))

		return 0;



	if (!smu->pm_enabled)
@@ -2142,7 +2142,7 @@ static int smu_resume(struct amdgpu_ip_block *ip_block) 
	struct amdgpu_device *adev = ip_block->adev;

	struct smu_context *smu = adev->powerplay.pp_handle;



	if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))

	if (amdgpu_sriov_multi_vf_mode(adev))

		return 0;



	if (!smu->pm_enabled)