Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uxa: Make the glamor/uxa transition more verbose 

And so hopefully make it clearer. In the process we restore the flushing
behaviour for UXA back to before the glamor intervention.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-11-21 12:56:32 +00:00
parent b0d64a9567
commit 4a27dd287c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/intel_uxa.c
View File

@ -706,15 +706,19 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
dri_bo *bo = priv->bo;
int ret;
if (!list_is_empty(&priv->batch) &&
((access == UXA_ACCESS_RW || access == UXA_GLAMOR_ACCESS_RW)
|| priv->batch_write))
intel_batch_submit(scrn);
if (access == UXA_GLAMOR_ACCESS_RW || access == UXA_GLAMOR_ACCESS_RO)
/* Transitioning to glamor acceleration, we need to flush all pending
* usage by UXA. */
if (access == UXA_GLAMOR_ACCESS_RW || access == UXA_GLAMOR_ACCESS_RO) {
if (!list_is_empty(&priv->batch))
intel_batch_submit(scrn);
return TRUE;
}
/* When falling back to swrast, flush all pending operations */
intel_glamor_flush(intel);
if (!list_is_empty(&priv->batch) &&
(access == UXA_ACCESS_RW || priv->batch_write))
intel_batch_submit(scrn);
if (priv->tiling || bo->size <= intel->max_gtt_map_size)
ret = drm_intel_gem_bo_map_gtt(bo);
@ -722,8 +726,10 @@ static Bool intel_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
ret = dri_bo_map(bo, access == UXA_ACCESS_RW);
if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"%s: bo map failed: %s\n",
"%s: bo map (use gtt? %d, access %d) failed: %s\n",
__FUNCTION__,
priv->tiling || bo->size <= intel->max_gtt_map_size,
access,
strerror(-ret));
return FALSE;
}