diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-09-27 02:54:54 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-09-27 02:54:54 -0400 |
| commit | 7b76d0588477d4b6097a9048b42835a45caf5c48 (patch) | |
| tree | fa4e0bcd49f8d17f26795224290c8f8460aa4116 /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | a74c0aa524050e5fd6c275a153b1f37283f6e37c (diff) | |
| parent | bf78296ab1cb215d0609ac6cff4e43e941e51265 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging 4.19-rc5 to pick up sun4i fix
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 1abf5b5bac9e..b927e8798534 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |||
| @@ -105,8 +105,8 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work) | |||
| 105 | struct amdgpu_device *adev = container_of(work, struct amdgpu_device, | 105 | struct amdgpu_device *adev = container_of(work, struct amdgpu_device, |
| 106 | reset_work); | 106 | reset_work); |
| 107 | 107 | ||
| 108 | if (!amdgpu_sriov_vf(adev)) | 108 | if (!amdgpu_sriov_vf(adev) && amdgpu_device_should_recover_gpu(adev)) |
| 109 | amdgpu_device_gpu_recover(adev, NULL, false); | 109 | amdgpu_device_gpu_recover(adev, NULL); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | /** | 112 | /** |