Commit 5a5099cb authored by Xiangliang Yu's avatar Xiangliang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/virt: rename fieldes of virtualization structure 



Use acronym to rename fields to make easy to spell out.

Signed-off-by: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e638ae9

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

+1 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ struct amdgpu_device { 
	/* amdkfd interface */

	struct kfd_dev          *kfd;



	struct amdgpu_virtualization virtualization;

	struct amdgpu_virt	virt;



	/* link all shadow bo */

	struct list_head                shadow_list;

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

+1 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ static int amdgpu_resume(struct amdgpu_device *adev) 
static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev)

{

	if (amdgpu_atombios_has_gpu_virtualization_table(adev))

		adev->virtualization.virtual_caps |= AMDGPU_SRIOV_CAPS_SRIOV_VBIOS;

		adev->virt.caps |= AMDGPU_SRIOV_CAPS_SRIOV_VBIOS;

}



/**

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

+7 −7
Original line number Diff line number Diff line
@@ -29,21 +29,21 @@ 
#define AMDGPU_SRIOV_CAPS_IS_VF        (1 << 2) /* this GPU is a virtual function */

#define AMDGPU_PASSTHROUGH_MODE        (1 << 3) /* thw whole GPU is pass through for VM */

/* GPU virtualization */

struct amdgpu_virtualization {

	uint32_t virtual_caps;

struct amdgpu_virt {

	uint32_t caps;

};



#define amdgpu_sriov_enabled(adev) \

((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV)

((adev)->virt.caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV)



#define amdgpu_sriov_vf(adev) \

((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_IS_VF)

((adev)->virt.caps & AMDGPU_SRIOV_CAPS_IS_VF)



#define amdgpu_sriov_bios(adev) \

((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS)

((adev)->virt.caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS)



#define amdgpu_passthrough(adev) \

((adev)->virtualization.virtual_caps & AMDGPU_PASSTHROUGH_MODE)

((adev)->virt.caps & AMDGPU_PASSTHROUGH_MODE)



static inline bool is_virtual_machine(void)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ static uint32_t cik_get_rev_id(struct amdgpu_device *adev) 
static void cik_detect_hw_virtualization(struct amdgpu_device *adev)

{

	if (is_virtual_machine()) /* passthrough mode */

		adev->virtualization.virtual_caps |= AMDGPU_PASSTHROUGH_MODE;

		adev->virt.caps |= AMDGPU_PASSTHROUGH_MODE;

}



static const struct amdgpu_asic_funcs cik_asic_funcs =

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

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int si_set_uvd_clocks(struct amdgpu_device *adev, u32 vclk, u32 dclk) 
static void si_detect_hw_virtualization(struct amdgpu_device *adev)

{

	if (is_virtual_machine()) /* passthrough mode */

		adev->virtualization.virtual_caps |= AMDGPU_PASSTHROUGH_MODE;

		adev->virt.caps |= AMDGPU_PASSTHROUGH_MODE;

}



static const struct amdgpu_asic_funcs si_asic_funcs =

CRA Git | Maintained and supported by SUSTech CRA and CCSE