diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:13:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:13:08 +1000 |
| commit | d2dbaaf6265d292575bfe41bf668b0cab759e19c (patch) | |
| tree | 255a26df4d499798d0af62d43773594ca2cd0ad7 /drivers/gpu/drm/cirrus/cirrus_ttm.c | |
| parent | 7e17fc0b69fbec2c25398adfb18a18fa6b210a53 (diff) | |
| parent | f3b2bbdc8a87a080ccd23d27fca4b87d61340dd4 (diff) | |
Merge branch 'server-fixes' into drm-next
Merge the fixes for the server driver dirty update paths
* server-fixes:
drm/cirrus: deal with bo reserve fail in dirty update path
drm/ast: deal with bo reserve fail in dirty update path
drm/mgag200: deal with bo reserve fail in dirty update path
Diffstat (limited to 'drivers/gpu/drm/cirrus/cirrus_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index 1413a26e490..2ed8cfc740c 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c @@ -321,7 +321,7 @@ int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait) ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); if (ret) { - if (ret != -ERESTARTSYS) + if (ret != -ERESTARTSYS && ret != -EBUSY) DRM_ERROR("reserve failed %p\n", bo); return ret; } |