drm/amdgpu/virt: rename fieldes of virtualization structure
Subsystems (2)
PATCH 1/1 drm/amdgpu/virt: rename fieldes of virtualization structure
Use acronym to rename fields to make easy to spell out.
Signed-off-by Xiangliang Yu <[email protected]>
--- 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -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 ; }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +7 -7
@@ -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 +#endif
drivers/gpu/drm/amd/amdgpu/cik.c +1 -1
@@ -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 =
drivers/gpu/drm/amd/amdgpu/si.c +1 -1
@@ -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 =
drivers/gpu/drm/amd/amdgpu/vi.c +3 -3
@@ -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 ; } }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1483782572-11426-1-git-send-email-Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byQuoted 3 lines · Xiangliang Yu
Use acronym to rename fields to make easy to spell out.
Signed-off-by Xiangliang Yu <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 125 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -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 ; }/** drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +7
-7@@ -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 +#endif drivers/gpu/drm/amd/amdgpu/cik.c +1
-1@@ -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 =drivers/gpu/drm/amd/amdgpu/si.c +1
-1@@ -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 =drivers/gpu/drm/amd/amdgpu/vi.c +3
-4@@ -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
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx