diff options
author | wentalou <Wentao.Lou@amd.com> | 2019-01-17 04:38:33 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-01-25 16:15:35 -0500 |
commit | f14899fd2a560796450e9af383dfaee6ce557d6b (patch) | |
tree | 97b0853c8ad764c9d8f56d9a30be372430ddf065 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 24ba59501257f35b4e1adde9c643f3d149e44084 (diff) |
drm/amdgpu: sriov should skip asic_reset in device_init
sriov would meet guest driver load failure,
if calling amdgpu_asic_reset in amdgpu_device_init.
sriov should skip asic_reset in device_init.
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 8a61764e64cf..e20dce438d37 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -2553,7 +2553,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, | |||
2553 | /* check if we need to reset the asic | 2553 | /* check if we need to reset the asic |
2554 | * E.g., driver was not cleanly unloaded previously, etc. | 2554 | * E.g., driver was not cleanly unloaded previously, etc. |
2555 | */ | 2555 | */ |
2556 | if (amdgpu_asic_need_reset_on_init(adev)) { | 2556 | if (!amdgpu_sriov_vf(adev) && amdgpu_asic_need_reset_on_init(adev)) { |
2557 | r = amdgpu_asic_reset(adev); | 2557 | r = amdgpu_asic_reset(adev); |
2558 | if (r) { | 2558 | if (r) { |
2559 | dev_err(adev->dev, "asic reset on init failed\n"); | 2559 | dev_err(adev->dev, "asic reset on init failed\n"); |