diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-08-09 21:43:02 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-08-09 21:43:02 -0400 |
| commit | 557ce95051c8eff67af48612ab350d8408aa0541 (patch) | |
| tree | 701b570e51724a90595b55846290f0298429c085 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 8511b7da18694491afb50a5cf1515c29a999c7a4 (diff) | |
| parent | b045d3af7d1f443dd5209a096568e0ce983127e9 (diff) | |
Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next
More fixes for 4.19:
- Fixes for scheduler
- Fix for SR-IOV
- Fixes for display
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180809200052.2777-1-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 e839470880d7..1e66dfd0e39c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
| @@ -3108,7 +3108,7 @@ static int amdgpu_device_handle_vram_lost(struct amdgpu_device *adev) | |||
| 3108 | long tmo; | 3108 | long tmo; |
| 3109 | 3109 | ||
| 3110 | if (amdgpu_sriov_runtime(adev)) | 3110 | if (amdgpu_sriov_runtime(adev)) |
| 3111 | tmo = msecs_to_jiffies(amdgpu_lockup_timeout); | 3111 | tmo = msecs_to_jiffies(8000); |
| 3112 | else | 3112 | else |
| 3113 | tmo = msecs_to_jiffies(100); | 3113 | tmo = msecs_to_jiffies(100); |
| 3114 | 3114 | ||