diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-11-11 18:15:22 +0300 |
| commit | a04dae9eb15a2629de75c4ddde44e677a356f93a (patch) | |
| tree | b7e4b1a0983c4882abbdba09107c09836e0ee0f0 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | 4ce8e6a51abfc69bf222f676cfe938f7732385d7 (diff) | |
| parent | f336c3f072216a16187b22069681d014dcb43db6 (diff) | |
| download | linux-a04dae9eb15a2629de75c4ddde44e677a356f93a.tar.xz | |
Merge branch 'topic/restize-docs' into for-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b0f6e6957536..82dc8d20e28a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -519,7 +519,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, r = ttm_eu_reserve_buffers(&p->ticket, &p->validated, true, &duplicates); if (unlikely(r != 0)) { - DRM_ERROR("ttm_eu_reserve_buffers failed.\n"); + if (r != -ERESTARTSYS) + DRM_ERROR("ttm_eu_reserve_buffers failed.\n"); goto error_free_pages; } |