diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2012-04-23 00:31:48 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-04-24 12:41:39 +1000 |
| commit | d954648b4872e6b40ec8768a14eee818bc7613a8 (patch) | |
| tree | 9c2416e5ef2f9e09272190a3c86d113569f00fbb | |
| parent | 73b9a2881c37990dee0afb9cb23a6a1e85339ede (diff) | |
nouveau: remove unnecessary EAGAIN loops
drmCommandWrite / drmCommandWriteRead already loop on EAGAIN.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | nouveau/nouveau.c | 8 | ||||
| -rw-r--r-- | nouveau/pushbuf.c | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index 699b9b76..f0bc2c3f 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -461,12 +461,8 @@ nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access, if (access & NOUVEAU_BO_NOBLOCK) req.flags |= NOUVEAU_GEM_CPU_PREP_NOWAIT; - do { - ret = drmCommandWrite(bo->device->fd, - DRM_NOUVEAU_GEM_CPU_PREP, - &req, sizeof(req)); - } while (ret == -EAGAIN); - + ret = drmCommandWrite(bo->device->fd, DRM_NOUVEAU_GEM_CPU_PREP, + &req, sizeof(req)); if (ret == 0) nvbo->access = 0; return ret; diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c index 103737e6..7b9dbaad 100644 --- a/nouveau/pushbuf.c +++ b/nouveau/pushbuf.c @@ -341,11 +341,8 @@ pushbuf_submit(struct nouveau_pushbuf *push, struct nouveau_object *chan) pushbuf_dump(krec, krec_id++, fifo->channel); #ifndef SIMULATE - do { - ret = drmCommandWriteRead(dev->fd, - DRM_NOUVEAU_GEM_PUSHBUF, - &req, sizeof(req)); - } while (ret == -EAGAIN); + ret = drmCommandWriteRead(dev->fd, DRM_NOUVEAU_GEM_PUSHBUF, + &req, sizeof(req)); nvpb->suffix0 = req.suffix0; nvpb->suffix1 = req.suffix1; dev->vram_limit = (req.vram_available * 80) / 100; |