diff options
| author | Pixel Ding <Pixel.Ding@amd.com> | 2017-11-08 11:03:14 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 12:47:18 -0500 |
| commit | 1daee8b472e896f477e490ca66e58d1f8f0f4e61 (patch) | |
| tree | 19d16782e0eab09d312a21e002947724cecbc775 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | baef9a196f00b30400443fd56455b8ed9a6a4173 (diff) | |
| download | talos-obmc-linux-1daee8b472e896f477e490ca66e58d1f8f0f4e61.tar.gz talos-obmc-linux-1daee8b472e896f477e490ca66e58d1f8f0f4e61.zip | |
drm/amdgpu: revise retry init to fully cleanup driver
Retry at drm_dev_register instead of amdgpu_device_init.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Pixel Ding <Pixel.Ding@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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 57267ac265f0..ee2a5f9a32f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2390,6 +2390,9 @@ int amdgpu_device_init(struct amdgpu_device *adev, amdgpu_virt_mmio_blocked(adev) && !amdgpu_virt_wait_reset(adev)) { dev_err(adev->dev, "VF exclusive mode timeout\n"); + /* Don't send request since VF is inactive. */ + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME; + adev->virt.ops = NULL; r = -EAGAIN; goto failed; } |
