diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-12-02 20:48:37 +0000 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-03-01 19:09:47 +0000 |
| commit | b57e35eb17554e4889c2b0fddb746f67ddcd5655 (patch) | |
| tree | a1a1094fe9e6fb1d54420b480d620c12a779eeef /src/i830_uxa.c | |
| parent | 6c90bfb90ce459206bcb61033fba9630ed38e220 (diff) | |
Remove flush parameter from intel_batch_flush()
There is only a single caller that wishes to forcibly append a flush
into the batch: intel_sync(). So move the logic there.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(Cherry picked from commit 98e11210367c950e3f932419d2a4722cf971885d)
Diffstat (limited to 'src/i830_uxa.c')
| -rw-r--r-- | src/i830_uxa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_uxa.c b/src/i830_uxa.c index 96e10b17..ed368053 100644 --- a/src/i830_uxa.c +++ b/src/i830_uxa.c @@ -92,7 +92,7 @@ i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, bo_table[0] = intel->batch_bo; if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) != 0) { - intel_batch_flush(scrn, FALSE); + intel_batch_flush(scrn); bo_table[0] = intel->batch_bo; if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) != 0) { @@ -572,7 +572,7 @@ static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) if (!list_is_empty(&priv->batch) && (access == UXA_ACCESS_RW || priv->batch_write_domain)) - intel_batch_flush(scrn, FALSE); + intel_batch_flush(scrn); if (bo) { @@ -580,7 +580,7 @@ static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) if (!scrn->vtSema || !intel->have_gem) { if ((ret = dri_bo_map(bo, access == UXA_ACCESS_RW)) != 0) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s: bo map failed\n", + "%s: bo map failed %s\n", __FUNCTION__, strerror(-ret)); return FALSE; } @@ -598,7 +598,7 @@ static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access) if ((ret = dri_bo_map(bo, access == UXA_ACCESS_RW)) != 0) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "%s: bo map failed\n", + "%s: bo map failed %s\n", __FUNCTION__, strerror(-ret)); return FALSE; } |