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

sna: Defer the copy back from the shadow CRTC bo until we allocate the target 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-09 16:30:15 +01:00
parent b00a60b417
commit bb2d5e3696
1 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/sna/sna_display.c
View File

@ -1044,36 +1044,32 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
if (flags == 0 || pixmap != sna->front || !sna->mode.shadow_damage)
goto done;
if ((flags & __MOVE_SCANOUT) == 0) {
while (!list_is_empty(&sna->mode.shadow_crtc)) {
struct sna_crtc *crtc =
list_first_entry(&sna->mode.shadow_crtc, struct sna_crtc, shadow_link);
RegionRec region;
if ((flags & MOVE_WRITE) == 0) {
if ((flags & __MOVE_SCANOUT) == 0) {
while (!list_is_empty(&sna->mode.shadow_crtc)) {
struct sna_crtc *crtc =
list_first_entry(&sna->mode.shadow_crtc, struct sna_crtc, shadow_link);
DBG(("%s: copying replaced CRTC: (%d, %d), (%d, %d)\n",
__FUNCTION__,
crtc->base->bounds.x1,
crtc->base->bounds.y1,
crtc->base->bounds.x2,
crtc->base->bounds.y2));
ret = sna->render.copy_boxes(sna, GXcopy,
pixmap, crtc->shadow_bo, -crtc->base->bounds.x1, -crtc->base->bounds.y1,
pixmap, priv->gpu_bo, 0, 0,
&crtc->base->bounds, 1,
0);
DBG(("%s: copying replaced CRTC: (%d, %d), (%d, %d)\n",
__FUNCTION__,
crtc->base->bounds.x1,
crtc->base->bounds.y1,
crtc->base->bounds.x2,
crtc->base->bounds.y2));
ret &= sna->render.copy_boxes(sna, GXcopy,
pixmap, crtc->shadow_bo, -crtc->base->bounds.x1, -crtc->base->bounds.y1,
pixmap, priv->gpu_bo, 0, 0,
&crtc->base->bounds, 1,
0);
kgem_bo_destroy(&sna->kgem, crtc->shadow_bo);
crtc->shadow_bo = NULL;
list_del(&crtc->shadow_link);
region.extents = crtc->base->bounds;
region.data = NULL;
RegionSubtract(&sna->mode.shadow_region, &sna->mode.shadow_region, &region);
kgem_bo_destroy(&sna->kgem, crtc->shadow_bo);
crtc->shadow_bo = NULL;
list_del(&crtc->shadow_link);
}
}
}
if ((flags & MOVE_WRITE) == 0)
return true;
return ret;
}
assert(sna->mode.shadow_active);
@ -1133,6 +1129,32 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
sna->mode.shadow_damage = damage;
while (!list_is_empty(&sna->mode.shadow_crtc)) {
struct sna_crtc *crtc =
list_first_entry(&sna->mode.shadow_crtc, struct sna_crtc, shadow_link);
RegionRec region;
DBG(("%s: copying replaced CRTC: (%d, %d), (%d, %d)\n",
__FUNCTION__,
crtc->base->bounds.x1,
crtc->base->bounds.y1,
crtc->base->bounds.x2,
crtc->base->bounds.y2));
ret = sna->render.copy_boxes(sna, GXcopy,
pixmap, crtc->shadow_bo, -crtc->base->bounds.x1, -crtc->base->bounds.y1,
pixmap, bo, 0, 0,
&crtc->base->bounds, 1,
0);
kgem_bo_destroy(&sna->kgem, crtc->shadow_bo);
crtc->shadow_bo = NULL;
list_del(&crtc->shadow_link);
region.extents = crtc->base->bounds;
region.data = NULL;
RegionSubtract(&sna->mode.shadow_region, &sna->mode.shadow_region, &region);
}
if (flags & MOVE_READ && RegionNotEmpty(&sna->mode.shadow_region)) {
DBG(("%s: copying existing GPU damage: %ldx(%d, %d), (%d, %d)\n",
__FUNCTION__, (long)REGION_NUM_RECTS(&sna->mode.shadow_region),