diff options
author | Xiangliang Yu <Xiangliang.Yu@amd.com> | 2017-01-08 22:53:14 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-01-27 11:13:05 -0500 |
commit | c8394f38fa2362385fd34f7034a2276b458c640e (patch) | |
tree | 4db252af5784403a7619a28e96f91da2a700ad72 /drivers/gpu/drm/amd/amdgpu/si.c | |
parent | 91caa081378c612030bfa9762fd7d88036508238 (diff) |
drm/amdgpu: remove detect_hw_virtualization interface
Call detection function driectly, so remove the interface.
V2: ci and si also need to call the detect function.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 6a85daa63d21..413a516dfeb7 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c | |||
@@ -1144,7 +1144,6 @@ static void si_detect_hw_virtualization(struct amdgpu_device *adev) | |||
1144 | static const struct amdgpu_asic_funcs si_asic_funcs = | 1144 | static const struct amdgpu_asic_funcs si_asic_funcs = |
1145 | { | 1145 | { |
1146 | .read_disabled_bios = &si_read_disabled_bios, | 1146 | .read_disabled_bios = &si_read_disabled_bios, |
1147 | .detect_hw_virtualization = si_detect_hw_virtualization, | ||
1148 | .read_register = &si_read_register, | 1147 | .read_register = &si_read_register, |
1149 | .reset = &si_asic_reset, | 1148 | .reset = &si_asic_reset, |
1150 | .set_vga_state = &si_vga_set_state, | 1149 | .set_vga_state = &si_vga_set_state, |
@@ -1861,6 +1860,8 @@ static const struct amdgpu_ip_block_version si_common_ip_block = | |||
1861 | 1860 | ||
1862 | int si_set_ip_blocks(struct amdgpu_device *adev) | 1861 | int si_set_ip_blocks(struct amdgpu_device *adev) |
1863 | { | 1862 | { |
1863 | si_detect_hw_virtualization(adev); | ||
1864 | |||
1864 | switch (adev->asic_type) { | 1865 | switch (adev->asic_type) { |
1865 | case CHIP_VERDE: | 1866 | case CHIP_VERDE: |
1866 | case CHIP_TAHITI: | 1867 | case CHIP_TAHITI: |