diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-02 02:45:02 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-02 12:46:56 +1000 |
| commit | f3b2bbdc8a87a080ccd23d27fca4b87d61340dd4 (patch) | |
| tree | 34101348a8b732dcf68cc8c869938b393b1e6dae /drivers/gpu/drm/cirrus/cirrus_ttm.c | |
| parent | 306373b645d80625335b8e684fa09b14ba460cec (diff) | |
| download | op-kernel-dev-f3b2bbdc8a87a080ccd23d27fca4b87d61340dd4.zip op-kernel-dev-f3b2bbdc8a87a080ccd23d27fca4b87d61340dd4.tar.gz | |
drm/cirrus: deal with bo reserve fail in dirty update path
Port over the mgag200 fix to cirrus as it suffers the same issue.
On F19 testing, it was noticed we get a lot of errors in dmesg
about being unable to reserve the buffer when plymouth starts,
this is due to the buffer being in the process of migrating,
so it makes sense we can't reserve it.
In order to deal with it, this adds delayed updates for the dirty
updates, when the bo is unreservable, in the normal console case
this shouldn't ever happen, its just when plymouth or X is
pushing the console bo to system memory.
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 1413a26..2ed8cfc 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; } |
