On Sat, Jan 7, 2017 at 4:49 AM, Xiangliang Yu <Xiangliang.Yu at amd.com> wrote:
> Use acronym to rename fields to make easy to spell out.
>
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 14 +++++++-------
> drivers/gpu/drm/amd/amdgpu/cik.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/si.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vi.c | 6 +++---
> 6 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index b6fd39d..b7d520fc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1483,7 +1483,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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 253d3d1..f82919d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1610,7 +1610,7 @@ bool amdgpu_device_has_dc_support(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;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> index 2c37a37..0d821d9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> @@ -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)
> {
> @@ -54,4 +54,4 @@ static inline bool is_virtual_machine(void)
> #endif
> }
>
> -#endif
> \ No newline at end of file
> +#endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
> index ef3b302..3793a04 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c
> @@ -1628,7 +1628,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 =
> diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
> index 9bf7afb..6a85daa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si.c
> @@ -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 =
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
> index 16ba943..b2ce7da 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
> @@ -446,14 +446,14 @@ static void vi_detect_hw_virtualization(struct amdgpu_device *adev)
> /* bit0: 0 means pf and 1 means vf */
> /* bit31: 0 means disable IOV and 1 means enable */
> if (reg & 1)
> - adev->virtualization.virtual_caps |= AMDGPU_SRIOV_CAPS_IS_VF;
> + adev->virt.caps |= AMDGPU_SRIOV_CAPS_IS_VF;
>
> if (reg & 0x80000000)
> - adev->virtualization.virtual_caps |= AMDGPU_SRIOV_CAPS_ENABLE_IOV;
> + adev->virt.caps |= AMDGPU_SRIOV_CAPS_ENABLE_IOV;
>
> if (reg == 0) {
> if (is_virtual_machine()) /* passthrough mode exclus sr-iov mode */
> - adev->virtualization.virtual_caps |= AMDGPU_PASSTHROUGH_MODE;
> + adev->virt.caps |= AMDGPU_PASSTHROUGH_MODE;
> }
> }
>
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
