diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2018-02-27 06:15:08 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-05 15:39:05 -0500 |
commit | ada6770e956b7f7d298bfef56fed457ade5bad9e (patch) | |
tree | 3fc0ffe8b4a2d384ecac2681496677ed86e8de0f /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
parent | 6848d73e889bb29cfede51df8c1d0496c9787454 (diff) |
drm/amd/pp: Remove cgs_query_system_info
Get gpu info through adev directly in powerplay
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 795be958cf5e..f37482c76e20 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
@@ -835,64 +835,6 @@ static int amdgpu_cgs_is_virtualization_enabled(void *cgs_device) | |||
835 | return amdgpu_sriov_vf(adev); | 835 | return amdgpu_sriov_vf(adev); |
836 | } | 836 | } |
837 | 837 | ||
838 | static int amdgpu_cgs_query_system_info(struct cgs_device *cgs_device, | ||
839 | struct cgs_system_info *sys_info) | ||
840 | { | ||
841 | CGS_FUNC_ADEV; | ||
842 | |||
843 | if (NULL == sys_info) | ||
844 | return -ENODEV; | ||
845 | |||
846 | if (sizeof(struct cgs_system_info) != sys_info->size) | ||
847 | return -ENODEV; | ||
848 | |||
849 | switch (sys_info->info_id) { | ||
850 | case CGS_SYSTEM_INFO_ADAPTER_BDF_ID: | ||
851 | sys_info->value = adev->pdev->devfn | (adev->pdev->bus->number << 8); | ||
852 | break; | ||
853 | case CGS_SYSTEM_INFO_PCIE_GEN_INFO: | ||
854 | sys_info->value = adev->pm.pcie_gen_mask; | ||
855 | break; | ||
856 | case CGS_SYSTEM_INFO_PCIE_MLW: | ||
857 | sys_info->value = adev->pm.pcie_mlw_mask; | ||
858 | break; | ||
859 | case CGS_SYSTEM_INFO_PCIE_DEV: | ||
860 | sys_info->value = adev->pdev->device; | ||
861 | break; | ||
862 | case CGS_SYSTEM_INFO_PCIE_REV: | ||
863 | sys_info->value = adev->pdev->revision; | ||
864 | break; | ||
865 | case CGS_SYSTEM_INFO_CG_FLAGS: | ||
866 | sys_info->value = adev->cg_flags; | ||
867 | break; | ||
868 | case CGS_SYSTEM_INFO_PG_FLAGS: | ||
869 | sys_info->value = adev->pg_flags; | ||
870 | break; | ||
871 | case CGS_SYSTEM_INFO_GFX_CU_INFO: | ||
872 | sys_info->value = adev->gfx.cu_info.number; | ||
873 | break; | ||
874 | case CGS_SYSTEM_INFO_GFX_SE_INFO: | ||
875 | sys_info->value = adev->gfx.config.max_shader_engines; | ||
876 | break; | ||
877 | case CGS_SYSTEM_INFO_PCIE_SUB_SYS_ID: | ||
878 | sys_info->value = adev->pdev->subsystem_device; | ||
879 | break; | ||
880 | case CGS_SYSTEM_INFO_PCIE_SUB_SYS_VENDOR_ID: | ||
881 | sys_info->value = adev->pdev->subsystem_vendor; | ||
882 | break; | ||
883 | case CGS_SYSTEM_INFO_PCIE_BUS_DEVFN: | ||
884 | sys_info->value = adev->pdev->devfn; | ||
885 | break; | ||
886 | case CGS_SYSTEM_INFO_VRAM_WIDTH: | ||
887 | sys_info->value = adev->gmc.vram_width; | ||
888 | break; | ||
889 | default: | ||
890 | return -ENODEV; | ||
891 | } | ||
892 | |||
893 | return 0; | ||
894 | } | ||
895 | |||
896 | static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device, | 838 | static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device, |
897 | struct cgs_display_info *info) | 839 | struct cgs_display_info *info) |
898 | { | 840 | { |
@@ -996,7 +938,6 @@ static const struct cgs_ops amdgpu_cgs_ops = { | |||
996 | .set_clockgating_state = amdgpu_cgs_set_clockgating_state, | 938 | .set_clockgating_state = amdgpu_cgs_set_clockgating_state, |
997 | .get_active_displays_info = amdgpu_cgs_get_active_displays_info, | 939 | .get_active_displays_info = amdgpu_cgs_get_active_displays_info, |
998 | .notify_dpm_enabled = amdgpu_cgs_notify_dpm_enabled, | 940 | .notify_dpm_enabled = amdgpu_cgs_notify_dpm_enabled, |
999 | .query_system_info = amdgpu_cgs_query_system_info, | ||
1000 | .is_virtualization_enabled = amdgpu_cgs_is_virtualization_enabled, | 941 | .is_virtualization_enabled = amdgpu_cgs_is_virtualization_enabled, |
1001 | .enter_safe_mode = amdgpu_cgs_enter_safe_mode, | 942 | .enter_safe_mode = amdgpu_cgs_enter_safe_mode, |
1002 | .lock_grbm_idx = amdgpu_cgs_lock_grbm_idx, | 943 | .lock_grbm_idx = amdgpu_cgs_lock_grbm_idx, |