xf86-video-intel: 3 commits - src/sna/sna_accel.c src/sna/sna_display.c src/sna/sna.h
Chris Wilson
ickle at kemper.freedesktop.org
Mon Oct 21 15:47:54 PDT 2013
src/sna/sna.h | 6 -
src/sna/sna_accel.c | 139 +++++++++++++++++++++------
src/sna/sna_display.c | 256 +++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 327 insertions(+), 74 deletions(-)
New commits:
commit d788b69fdb5ea73b1d283a89e53b2b19eaa90e6e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 21 23:44:29 2013 +0100
sna: Enable TearFree rendering for transformed scanouts
References: https://bugs.freedesktop.org/show_bug.cgi?id=22969
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 96fd2ef..fbd81d0 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -91,7 +91,7 @@ struct sna_crtc {
struct drm_mode_modeinfo kmode;
int dpms_mode;
PixmapPtr scanout_pixmap;
- struct kgem_bo *bo;
+ struct kgem_bo *bo, *shadow_bo;
uint32_t cursor;
bool shadow;
bool fallback_shadow;
@@ -962,6 +962,11 @@ static void sna_crtc_disable_shadow(struct sna *sna, struct sna_crtc *crtc)
if (!--sna->mode.shadow_active)
sna_mode_disable_shadow(sna);
+ if (crtc->shadow_bo) {
+ kgem_bo_destroy(&sna->kgem, crtc->shadow_bo);
+ crtc->shadow_bo = NULL;
+ }
+
crtc->shadow = false;
}
@@ -4117,11 +4122,10 @@ free_pixmap:
}
static void
-sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region)
+sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
{
struct sna *sna = to_sna(crtc->scrn);
- struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
- ScreenPtr screen = sna->scrn->pScreen;
+ ScreenPtr screen = crtc->scrn->pScreen;
struct sna_composite_op tmp;
PictFormatPtr format;
PicturePtr src, dst;
@@ -4138,7 +4142,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region)
if (pixmap == NullPixmap)
return;
- if (!sna_pixmap_attach_to_bo(pixmap, sna_crtc->bo))
+ if (!sna_pixmap_attach_to_bo(pixmap, bo))
goto free_pixmap;
error = sna_render_format_for_depth(sna->front->drawable.depth);
@@ -4248,10 +4252,6 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
tmp.drawable.depth = sna->front->drawable.depth;
tmp.drawable.bitsPerPixel = sna->front->drawable.bitsPerPixel;
- /* XXX for tear-free we may want to try copying to a back
- * and flipping.
- */
-
if (sna->render.copy_boxes(sna, GXcopy,
sna->front, priv->gpu_bo, 0, 0,
&tmp, sna_crtc->bo, -tx, -ty,
@@ -4260,7 +4260,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
}
if (can_render(sna))
- sna_crtc_redisplay__composite(crtc, region);
+ sna_crtc_redisplay__composite(crtc, region, sna_crtc->bo);
else
sna_crtc_redisplay__fallback(crtc, region);
}
@@ -4402,6 +4402,21 @@ void sna_mode_redisplay(struct sna *sna)
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
+ if (sna->mode.shadow_flip) {
+ DamagePtr damage;
+
+ damage = sna->mode.shadow_damage;
+ sna->mode.shadow_damage = NULL;
+
+ while (sna->mode.shadow_flip && sna_mode_has_pending_events(sna))
+ sna_mode_wakeup(sna);
+
+ sna->mode.shadow_damage = damage;
+ }
+
+ if (sna->mode.shadow_flip)
+ return;
+
assert(sna_pixmap(sna->front)->move_to_gpu == NULL);
if (wedged(sna) || !sna_pixmap_move_to_gpu(sna->front, MOVE_READ)) {
if (!sna_pixmap_move_to_cpu(sna->front, MOVE_READ))
@@ -4445,33 +4460,66 @@ void sna_mode_redisplay(struct sna *sna)
damage.extents = crtc->bounds;
damage.data = NULL;
+
RegionIntersect(&damage, &damage, region);
if (RegionNotEmpty(&damage)) {
- sna_crtc_redisplay(crtc, &damage);
- kgem_scanout_flush(&sna->kgem, sna_crtc->bo);
- }
- RegionUninit(&damage);
- }
-
- if (!sna->mode.shadow) {
- kgem_submit(&sna->kgem);
- RegionEmpty(region);
- return;
- }
-
- if (sna->mode.shadow_flip) {
- DamagePtr damage;
+ if (sna->flags & SNA_TEAR_FREE) {
+ struct drm_mode_crtc_page_flip arg;
+ struct kgem_bo *bo;
+
+ RegionUninit(&damage);
+ damage.extents = crtc->bounds;
+ damage.data = NULL;
+
+ bo = sna_crtc->shadow_bo;
+ if (bo == NULL)
+ bo = kgem_create_2d(&sna->kgem,
+ crtc->mode.HDisplay,
+ crtc->mode.VDisplay,
+ crtc->scrn->bitsPerPixel,
+ sna_crtc->bo->tiling,
+ CREATE_SCANOUT);
+ if (bo == NULL)
+ goto disable1;
+
+ sna_crtc_redisplay__composite(crtc, &damage, bo);
+ kgem_bo_submit(&sna->kgem, bo);
+
+ arg.crtc_id = sna_crtc->id;
+ arg.fb_id = get_fb(sna, bo,
+ crtc->mode.HDisplay,
+ crtc->mode.VDisplay);
+ if (arg.fb_id == 0)
+ goto disable1;
+
+ arg.user_data = 0;
+ arg.flags = DRM_MODE_PAGE_FLIP_EVENT;
+ arg.reserved = 0;
+
+ if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
+ DBG(("%s: flip [fb=%d] on crtc %d [%d, pipe=%d] failed - %d\n",
+ __FUNCTION__, arg.fb_id, i, crtc->id, crtc->pipe, errno));
+disable1:
+ xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
+ "%s: page flipping failed, disabling CRTC:%d (pipe=%d)\n",
+ __FUNCTION__, sna_crtc->id, sna_crtc->pipe);
+ sna_crtc_disable(crtc);
+ continue;
+ }
- damage = sna->mode.shadow_damage;
- sna->mode.shadow_damage = NULL;
+ sna_crtc->shadow_bo = sna_crtc->bo;
+ sna_crtc->bo = bo;
- while (sna->mode.shadow_flip && sna_mode_has_pending_events(sna))
- sna_mode_wakeup(sna);
-
- sna->mode.shadow_damage = damage;
+ sna->mode.shadow_flip++;
+ } else {
+ sna_crtc_redisplay(crtc, &damage);
+ kgem_scanout_flush(&sna->kgem, sna_crtc->bo);
+ }
+ }
+ RegionUninit(&damage);
}
- if (sna->mode.shadow_flip == 0) {
+ if (sna->mode.shadow) {
struct kgem_bo *new = __sna_pixmap_get_bo(sna->front);
struct kgem_bo *old = sna->mode.shadow;
@@ -4498,7 +4546,7 @@ void sna_mode_redisplay(struct sna *sna)
sna->scrn->virtualX,
sna->scrn->virtualY);
if (arg.fb_id == 0)
- goto disable;
+ goto disable2;
arg.user_data = 0;
arg.flags = DRM_MODE_PAGE_FLIP_EVENT;
@@ -4507,7 +4555,7 @@ void sna_mode_redisplay(struct sna *sna)
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
DBG(("%s: flip [fb=%d] on crtc %d [%d, pipe=%d] failed - %d\n",
__FUNCTION__, arg.fb_id, i, crtc->id, crtc->pipe, errno));
-disable:
+disable2:
xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
"%s: page flipping failed, disabling CRTC:%d (pipe=%d)\n",
__FUNCTION__, crtc->id, crtc->pipe);
@@ -4528,9 +4576,10 @@ disable:
sna->mode.shadow = new;
}
+ } else
+ kgem_submit(&sna->kgem);
- RegionEmpty(region);
- }
+ RegionEmpty(region);
}
void sna_mode_wakeup(struct sna *sna)
commit fa2687bdd5a4c8bc608dac8bb711035f0752a725
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 21 18:55:23 2013 +0100
sna: Eliminate the synchronous wait from inside TearFree
Defer the actual wait until the next use of the screen pixmap, and then
if needed replace the GPU bo with an alternative back buffer.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 7d08d23..304f712 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -131,6 +131,9 @@ struct sna_pixmap {
void *ptr;
#define PTR(ptr) ((void*)((uintptr_t)(ptr) & ~1))
+ bool (*move_to_gpu)(struct sna *, struct sna_pixmap *, unsigned);
+ void *move_to_gpu_data;
+
struct list flush_list;
struct list cow_list;
@@ -266,10 +269,11 @@ struct sna {
struct sna_mode {
drmModeResPtr kmode;
- int shadow_active;
DamagePtr shadow_damage;
struct kgem_bo *shadow;
+ int shadow_active;
int shadow_flip;
+ int front_active;
unsigned num_real_crtc;
unsigned num_real_output;
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 0676a6d..31b4230 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -350,10 +350,6 @@ static void assert_pixmap_damage(PixmapPtr p)
return;
}
- if (DAMAGE_IS_ALL(priv->gpu_damage)) {
- assert(priv->cpu == false || (priv->mapped && p->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu)));
- }
-
assert(!DAMAGE_IS_ALL(priv->gpu_damage) || priv->cpu_damage == NULL);
assert(!DAMAGE_IS_ALL(priv->cpu_damage) || priv->gpu_damage == NULL);
@@ -453,6 +449,7 @@ static void sna_pixmap_free_gpu(struct sna *sna, struct sna_pixmap *priv)
if (priv->gpu_bo && !priv->pinned) {
assert(!priv->flush);
+ assert(!priv->move_to_gpu);
sna_pixmap_unmap(priv->pixmap, priv);
kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
priv->gpu_bo = NULL;
@@ -639,6 +636,7 @@ struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling)
}
assert_pixmap_damage(pixmap);
+ assert(!priv->move_to_gpu);
bo = kgem_create_2d(&sna->kgem,
pixmap->drawable.width,
@@ -725,6 +723,8 @@ bool sna_pixmap_attach_to_bo(PixmapPtr pixmap, struct kgem_bo *bo)
return false;
assert(!priv->mapped);
+ assert(!priv->move_to_gpu);
+
priv->gpu_bo = kgem_bo_reference(bo);
assert(priv->gpu_bo->proxy == NULL);
sna_damage_all(&priv->gpu_damage,
@@ -1431,6 +1431,8 @@ static inline bool has_coherent_ptr(struct sna *sna, struct sna_pixmap *priv, un
if (priv == NULL)
return true;
+ assert(!priv->move_to_gpu);
+
if (!priv->mapped) {
if (!priv->cpu_bo)
return true;
@@ -1472,6 +1474,9 @@ static inline bool pixmap_inplace(struct sna *sna,
return false;
}
+ if (priv->move_to_gpu)
+ return false;
+
if (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo)) {
if ((flags & (MOVE_WRITE | MOVE_READ)) == (MOVE_WRITE | MOVE_READ)) {
DBG(("%s: no, GPU bo is busy\n", __FUNCTION__));
@@ -1738,6 +1743,7 @@ sna_pixmap_make_cow(struct sna *sna,
struct sna_cow *cow;
assert(src_priv->gpu_bo);
+ assert(src_priv->move_to_gpu == NULL);
if (!USE_COW)
return false;
@@ -1759,6 +1765,7 @@ sna_pixmap_make_cow(struct sna *sna,
return false;
}
+ assert(dst_priv->move_to_gpu == NULL);
assert(!dst_priv->flush);
cow = COW(src_priv->cow);
@@ -1817,6 +1824,11 @@ static inline bool operate_inplace(struct sna_pixmap *priv, unsigned flags)
assert((flags & MOVE_ASYNC_HINT) == 0);
+ if (priv->move_to_gpu) {
+ DBG(("%s: no, has pending move-to-gpu\n", __FUNCTION__));
+ return false;
+ }
+
if (priv->cow && flags & MOVE_WRITE) {
DBG(("%s: no, has COW\n", __FUNCTION__));
return false;
@@ -1875,6 +1887,17 @@ _sna_pixmap_move_to_cpu(PixmapPtr pixmap, unsigned int flags)
assert(priv->gpu_damage == NULL || priv->gpu_bo);
+ if (DAMAGE_IS_ALL(priv->cpu_damage)) {
+ DBG(("%s: CPU all-damaged\n", __FUNCTION__));
+ assert(priv->gpu_damage == NULL || DAMAGE_IS_ALL(priv->gpu_damage));
+ goto done;
+ }
+
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
+ DBG(("%s: move-to-gpu override failed\n", __FUNCTION__));
+ return false;
+ }
+
if ((flags & MOVE_READ) == 0 && UNDO) {
if (priv->gpu_bo)
kgem_bo_undo(&sna->kgem, priv->gpu_bo);
@@ -1895,6 +1918,7 @@ _sna_pixmap_move_to_cpu(PixmapPtr pixmap, unsigned int flags)
DBG(("%s: write inplace\n", __FUNCTION__));
assert(priv->cow == NULL || (flags & MOVE_WRITE) == 0);
assert(!priv->shm);
+ assert(!priv->move_to_gpu);
assert(priv->gpu_bo->exec == NULL);
assert((flags & MOVE_READ) == 0 || priv->cpu_damage == NULL);
@@ -1944,12 +1968,6 @@ skip_inplace_map:
}
}
- if (DAMAGE_IS_ALL(priv->cpu_damage)) {
- DBG(("%s: CPU all-damaged\n", __FUNCTION__));
- assert(priv->gpu_damage == NULL || DAMAGE_IS_ALL(priv->gpu_damage));
- goto done;
- }
-
assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
if (USE_INPLACE &&
@@ -1960,6 +1978,7 @@ skip_inplace_map:
DBG(("%s: try to operate inplace (GTT)\n", __FUNCTION__));
assert(priv->cow == NULL || (flags & MOVE_WRITE) == 0);
+ assert(!priv->move_to_gpu);
assert((flags & MOVE_READ) == 0 || priv->cpu_damage == NULL);
/* XXX only sync for writes? */
kgem_bo_submit(&sna->kgem, priv->gpu_bo);
@@ -1994,7 +2013,8 @@ skip_inplace_map:
sna_pixmap_unmap(pixmap, priv);
if (USE_INPLACE &&
- priv->gpu_damage && priv->cpu_damage == NULL && !priv->cow &&
+ priv->gpu_damage && priv->cpu_damage == NULL &&
+ !priv->cow && !priv->move_to_gpu &&
priv->gpu_bo->tiling == I915_TILING_NONE &&
(flags & MOVE_READ || kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, flags & MOVE_WRITE)) &&
((flags & (MOVE_WRITE | MOVE_ASYNC_HINT)) == 0 ||
@@ -2005,6 +2025,8 @@ skip_inplace_map:
assert(priv->cow == NULL || (flags & MOVE_WRITE) == 0);
assert(!priv->mapped);
+ assert(!priv->move_to_gpu);
+
ptr = kgem_bo_map__cpu(&sna->kgem, priv->gpu_bo);
if (ptr != NULL) {
pixmap->devPrivate.ptr = ptr;
@@ -2242,7 +2264,6 @@ static inline bool region_inplace(struct sna *sna,
if (DAMAGE_IS_ALL(priv->gpu_damage)) {
DBG(("%s: yes, already wholly damaged on the GPU\n", __FUNCTION__));
assert(priv->gpu_bo);
- assert(priv->cpu == false || (priv->mapped && pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu)));
return true;
}
@@ -2312,6 +2333,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
if (flags & MOVE_WRITE)
sna_pixmap_free_gpu(sna, priv);
+ goto contains_damage;
+ }
+
+ if (priv->cpu &&
+ priv->cpu_damage &&
+ sna_damage_contains_box__no_reduce(priv->cpu_damage,
+ ®ion->extents)) {
+ DBG(("%s: pixmap=%ld CPU damage contains region\n",
+ __FUNCTION__, pixmap->drawable.serialNumber));
+
+contains_damage:
+ sna_pixmap_unmap(pixmap, priv);
if (pixmap->devPrivate.ptr == NULL &&
!sna_pixmap_alloc_cpu(sna, pixmap, priv, false))
return false;
@@ -2363,6 +2396,8 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
DBG(("%s: try to operate inplace\n", __FUNCTION__));
assert(priv->cow == NULL || (flags & MOVE_WRITE) == 0);
+ assert(!priv->move_to_gpu);
+
/* XXX only sync for writes? */
kgem_bo_submit(&sna->kgem, priv->gpu_bo);
assert(priv->gpu_bo->exec == NULL);
@@ -2407,11 +2442,19 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
return _sna_pixmap_move_to_cpu(pixmap, flags | MOVE_READ);
}
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
+ DBG(("%s: move-to-gpu override failed\n", __FUNCTION__));
+ if (dx | dy)
+ RegionTranslate(region, -dx, -dy);
+ return false;
+ }
+
sna_pixmap_unmap(pixmap, priv);
if (USE_INPLACE &&
priv->gpu_damage &&
priv->gpu_bo->tiling == I915_TILING_NONE &&
+ priv->move_to_gpu == NULL &&
(priv->cow == NULL || (flags & MOVE_WRITE) == 0) &&
(DAMAGE_IS_ALL(priv->gpu_damage) ||
sna_damage_contains_box__no_reduce(priv->gpu_damage,
@@ -2939,6 +2982,11 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
assert_pixmap_contains_box(pixmap, box);
assert(priv->gpu_damage == NULL || priv->gpu_bo);
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, flags | (priv->cpu_damage ? MOVE_WRITE : 0))) {
+ DBG(("%s: move-to-gpu override failed\n", __FUNCTION__));
+ return NULL;
+ }
+
if (priv->cow && (flags & MOVE_WRITE || priv->cpu_damage)) {
unsigned cow = MOVE_READ;
@@ -2965,7 +3013,6 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
pixmap->drawable.height)) {
assert(priv->gpu_bo);
assert(priv->gpu_bo->proxy == NULL);
- assert(priv->cpu == false || (priv->mapped && pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu)));
sna_damage_destroy(&priv->cpu_damage);
list_del(&priv->flush_list);
goto done;
@@ -3251,7 +3298,6 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
assert(priv->cpu_damage == NULL);
assert(priv->gpu_bo);
assert(priv->gpu_bo->proxy == NULL);
- assert(priv->cpu == false || (priv->mapped && pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu)));
goto use_gpu_bo;
}
@@ -3435,6 +3481,22 @@ done:
return priv->gpu_bo;
use_gpu_bo:
+ if (priv->move_to_gpu) {
+ unsigned hint = MOVE_READ | MOVE_WRITE;
+
+ if (flags & IGNORE_CPU) {
+ region.extents = *box;
+ region.data = NULL;
+ if (region_subsumes_drawable(®ion, drawable))
+ hint = MOVE_WRITE;
+ }
+
+ if (!priv->move_to_gpu(to_sna_from_pixmap(pixmap), priv, hint)) {
+ DBG(("%s: move-to-gpu override failed\n", __FUNCTION__));
+ goto use_cpu_bo;
+ }
+ }
+
DBG(("%s: using whole GPU bo\n", __FUNCTION__));
assert(priv->gpu_bo != NULL);
assert(priv->gpu_bo->refcnt);
@@ -3645,7 +3707,12 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
if (priv == NULL)
return NULL;
- assert(priv->gpu_damage == NULL || priv->gpu_bo);
+ assert_pixmap_damage(pixmap);
+
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, flags)) {
+ DBG(("%s: move-to-gpu override failed\n", __FUNCTION__));
+ return NULL;
+ }
if ((flags & MOVE_READ) == 0 && UNDO) {
if (priv->gpu_bo)
@@ -4198,8 +4265,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
sna_pixmap_free_gpu(sna, priv);
}
- if (priv->cow) {
- DBG(("%s: no, has COW\n", __FUNCTION__));
+ if (priv->cow || priv->move_to_gpu) {
+ DBG(("%s: no, has COW or pending move-to-gpu\n", __FUNCTION__));
return false;
}
@@ -5187,6 +5254,11 @@ sna_copy_boxes__inplace(struct sna *sna, RegionPtr region, int alu,
break;
}
+ if (src_priv->move_to_gpu && !src_priv->move_to_gpu(sna, src_priv, MOVE_READ)) {
+ DBG(("%s - no, pending src move-to-gpu failed\n", __FUNCTION__));
+ return false;
+ }
+
if (!kgem_bo_can_map__cpu(&sna->kgem, src_priv->gpu_bo, FORCE_FULL_SYNC)) {
DBG(("%s - no, cannot map src for reads into the CPU\n", __FUNCTION__));
return false;
@@ -5271,6 +5343,11 @@ upload_inplace:
break;
}
+ if (dst_priv->move_to_gpu) {
+ DBG(("%s - no, pending dst move-to-gpu\n", __FUNCTION__));
+ return false;
+ }
+
if (!kgem_bo_can_map__cpu(&sna->kgem, dst_priv->gpu_bo, true)) {
DBG(("%s - no, cannot map dst for reads into the CPU\n", __FUNCTION__));
return false;
@@ -15045,6 +15122,9 @@ sna_get_image__inplace(PixmapPtr pixmap,
break;
}
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ))
+ return false;
+
if (!kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC))
return false;
@@ -15304,14 +15384,16 @@ static struct sna_pixmap *sna_accel_scanout(struct sna *sna)
{
struct sna_pixmap *priv;
- if (sna->vblank_interval == 0)
+ if (sna->mode.front_active == 0)
return NULL;
- if (sna->front == NULL)
- return NULL;
+ assert(sna->vblank_interval);
+ assert(sna->front);
priv = sna_pixmap(sna->front);
- return priv && priv->gpu_bo ? priv : NULL;
+ assert(priv->gpu_bo);
+
+ return priv;
}
#define TIME currentTime.milliseconds
@@ -15340,16 +15422,15 @@ static bool has_shadow(struct sna *sna)
{
DamagePtr damage = sna->mode.shadow_damage;
- if (!(damage && RegionNotEmpty(DamageRegion(damage))))
+ if (damage == NULL)
return false;
- DBG(("%s: has pending damage\n", __FUNCTION__));
- if ((sna->flags & SNA_TEAR_FREE) == 0)
- return true;
+ DBG(("%s: has pending damage? %d, outstanding flips: %d\n",
+ __FUNCTION__,
+ RegionNotEmpty(DamageRegion(damage)),
+ sna->mode.shadow_flip));
- DBG(("%s: outstanding flips: %d\n",
- __FUNCTION__, sna->mode.shadow_flip));
- return !sna->mode.shadow_flip;
+ return RegionNotEmpty(DamageRegion(damage));
}
static bool start_flush(struct sna *sna, struct sna_pixmap *scanout)
@@ -15419,7 +15500,7 @@ static bool sna_accel_do_flush(struct sna *sna)
int interval;
priv = sna_accel_scanout(sna);
- if (priv == NULL && !sna->mode.shadow_active && !has_offload_slaves(sna)) {
+ if (priv == NULL && !sna->mode.shadow_damage && !has_offload_slaves(sna)) {
DBG(("%s -- no scanout attached\n", __FUNCTION__));
sna_accel_disarm_timer(sna, FLUSH_TIMER);
return false;
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3e778be..96fd2ef 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -926,7 +926,7 @@ static void sna_mode_disable_shadow(struct sna *sna)
sna->mode.shadow = NULL;
}
- sna->mode.shadow_active = 0;
+ assert(sna->mode.shadow_active == 0);
}
static bool sna_crtc_enable_shadow(struct sna *sna, struct sna_crtc *crtc)
@@ -3932,6 +3932,7 @@ void sna_mode_update(struct sna *sna)
return;
/* Validate CRTC attachments and force consistency upon the kernel */
+ sna->mode.front_active = 0;
for (i = 0; i < config->num_crtc; i++) {
xf86CrtcPtr crtc = config->crtc[i];
struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
@@ -3958,6 +3959,9 @@ void sna_mode_update(struct sna *sna)
if (mode.fb_id != expected)
sna_crtc_disable(crtc);
+
+ if (sna->front && sna_crtc->bo == __sna_pixmap_get_bo(sna->front))
+ sna->mode.front_active++;
}
for (i = 0; i < config->num_output; i++) {
@@ -4261,20 +4265,118 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
sna_crtc_redisplay__fallback(crtc, region);
}
-static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
+struct wait_for_shadow {
+ RegionRec region;
+ struct kgem_bo *bo;
+};
+
+static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
+{
+ struct wait_for_shadow *wait = priv->move_to_gpu_data;
+ PixmapPtr pixmap = priv->pixmap;
+ DamagePtr damage;
+ bool ret = true;
+
+ damage = sna->mode.shadow_damage;
+ sna->mode.shadow_damage = NULL;
+
+ if (pixmap != sna->front)
+ goto done;
+
+ DBG(("%s: flags=%x, shadow_flip=%d\n", __FUNCTION__,
+ flags, sna->mode.shadow_flip));
+
+ while (sna->mode.shadow_flip && sna_mode_has_pending_events(sna))
+ sna_mode_wakeup(sna);
+
+ assert(priv->gpu_bo != sna->mode.shadow);
+
+ if (sna->mode.shadow_flip) {
+ struct kgem_bo *bo;
+
+ bo = kgem_create_2d(&sna->kgem,
+ pixmap->drawable.width,
+ pixmap->drawable.height,
+ pixmap->drawable.bitsPerPixel,
+ priv->gpu_bo->tiling,
+ CREATE_EXACT | CREATE_SCANOUT);
+ if (bo != NULL) {
+ DBG(("%s: replacing still-attached GPU bo\n",
+ __FUNCTION__));
+
+ sna_pixmap_unmap(pixmap, priv);
+ kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
+ priv->gpu_bo = bo;
+
+ sna_dri_pixmap_update_bo(sna, pixmap);
+
+ RegionUninit(&wait->region);
+
+ wait->region.extents.x1 = 0;
+ wait->region.extents.y1 = 0;
+ wait->region.extents.x2 = pixmap->drawable.width;
+ wait->region.extents.y2 = pixmap->drawable.height;
+ wait->region.data = NULL;
+ } else {
+ while (sna->mode.shadow_flip &&
+ sna_mode_wait_for_event(sna))
+ sna_mode_wakeup(sna);
+ }
+ }
+
+ if (flags & MOVE_READ) {
+ DBG(("%s: copying existing GPU damage: %ldx(%d, %d), (%d, %d)\n",
+ __FUNCTION__, (long)REGION_NUM_RECTS(&wait->region),
+ wait->region.extents.x1, wait->region.extents.y1,
+ wait->region.extents.x2, wait->region.extents.y2));
+ ret = sna->render.copy_boxes(sna, GXcopy,
+ pixmap, wait->bo, 0, 0,
+ pixmap, priv->gpu_bo, 0, 0,
+ REGION_RECTS(&wait->region),
+ REGION_NUM_RECTS(&wait->region),
+ 0);
+ }
+
+done:
+ kgem_bo_destroy(&sna->kgem, wait->bo);
+ RegionUninit(&wait->region);
+ free(wait);
+
+ priv->move_to_gpu_data = NULL;
+ priv->move_to_gpu = NULL;
+
+ sna->mode.shadow_damage = damage;
+
+ return ret;
+}
+
+static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo, RegionPtr region)
{
struct sna_pixmap *priv = sna_pixmap(pixmap);
+ struct wait_for_shadow *wait;
assert((priv->pinned & PIN_PRIME) == 0);
assert(bo != priv->gpu_bo);
assert(priv->gpu_bo);
+ assert(priv->move_to_gpu == NULL);
+ wait = malloc(sizeof(*wait));
+ if (wait != NULL) {
+ wait->bo = kgem_bo_reference(priv->gpu_bo);
+ RegionNull(&wait->region);
+ RegionCopy(&wait->region, region);
+
+ priv->move_to_gpu = wait_for_shadow;
+ priv->move_to_gpu_data = wait;
+ }
+
if (priv->cow)
sna_pixmap_undo_cow(to_sna_from_pixmap(pixmap), priv, 0);
sna_pixmap_unmap(pixmap, priv);
priv->gpu_bo = bo;
+ priv->pinned |= PIN_SCANOUT;
}
void sna_mode_redisplay(struct sna *sna)
@@ -4286,7 +4388,8 @@ void sna_mode_redisplay(struct sna *sna)
if (!sna->mode.shadow_damage)
return;
- DBG(("%s: posting shadow damage\n", __FUNCTION__));
+ DBG(("%s: posting shadow damage? %d\n",
+ __FUNCTION__, !RegionNil(DamageRegion(sna->mode.shadow_damage))));
assert((sna->flags & SNA_IS_HOSTED) == 0);
assert(sna->mode.shadow_active);
@@ -4294,6 +4397,12 @@ void sna_mode_redisplay(struct sna *sna)
if (RegionNil(region))
return;
+ DBG(("%s: damage: %ldx(%d, %d), (%d, %d)\n",
+ __FUNCTION__, (long)REGION_NUM_RECTS(region),
+ region->extents.x1, region->extents.y1,
+ region->extents.x2, region->extents.y2));
+
+ assert(sna_pixmap(sna->front)->move_to_gpu == NULL);
if (wedged(sna) || !sna_pixmap_move_to_gpu(sna->front, MOVE_READ)) {
if (!sna_pixmap_move_to_cpu(sna->front, MOVE_READ))
return;
@@ -4350,6 +4459,18 @@ void sna_mode_redisplay(struct sna *sna)
return;
}
+ if (sna->mode.shadow_flip) {
+ DamagePtr damage;
+
+ damage = sna->mode.shadow_damage;
+ sna->mode.shadow_damage = NULL;
+
+ while (sna->mode.shadow_flip && sna_mode_has_pending_events(sna))
+ sna_mode_wakeup(sna);
+
+ sna->mode.shadow_damage = damage;
+ }
+
if (sna->mode.shadow_flip == 0) {
struct kgem_bo *new = __sna_pixmap_get_bo(sna->front);
struct kgem_bo *old = sna->mode.shadow;
@@ -4361,9 +4482,12 @@ void sna_mode_redisplay(struct sna *sna)
struct sna_crtc *crtc = config->crtc[i]->driver_private;
struct drm_mode_crtc_page_flip arg;
+ if (crtc == NULL)
+ continue;
+
DBG(("%s: crtc %d [%d, pipe=%d] active? %d\n",
__FUNCTION__, i, crtc->id, crtc->pipe, crtc && crtc->bo));
- if (crtc == NULL || crtc->bo != old)
+ if (crtc->bo != old)
continue;
assert(config->crtc[i]->enabled);
@@ -4397,18 +4521,9 @@ disable:
}
if (sna->mode.shadow) {
- while (sna->mode.shadow_flip &&
- sna_mode_wait_for_event(sna))
- sna_mode_wakeup(sna);
- (void)sna->render.copy_boxes(sna, GXcopy,
- sna->front, new, 0, 0,
- sna->front, old, 0, 0,
- REGION_RECTS(region),
- REGION_NUM_RECTS(region),
- COPY_LAST);
- kgem_submit(&sna->kgem);
-
- set_bo(sna->front, old);
+ assert(old->refcnt >= 1);
+
+ set_bo(sna->front, old, region);
sna_dri_pixmap_update_bo(sna, sna->front);
sna->mode.shadow = new;
@@ -4440,10 +4555,12 @@ void sna_mode_wakeup(struct sna *sna)
sna_dri_vblank_handler(sna, (struct drm_event_vblank *)e);
break;
case DRM_EVENT_FLIP_COMPLETE:
- if (((struct drm_event_vblank *)e)->user_data)
+ if (((struct drm_event_vblank *)e)->user_data) {
sna_dri_page_flip_handler(sna, (struct drm_event_vblank *)e);
- else
- sna->mode.shadow_flip--;
+ } else {
+ if (!--sna->mode.shadow_flip)
+ sna_mode_redisplay(sna);
+ }
break;
default:
break;
commit 83c1d1efa1d0d24ebe606065a4305b81fe64b73b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Oct 21 17:52:05 2013 +0100
sna: Improve handling of blit fallbacks for untransfomed large scanouts
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index d630d76..3e778be 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4255,7 +4255,10 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
return;
}
- sna_crtc_redisplay__composite(crtc, region);
+ if (can_render(sna))
+ sna_crtc_redisplay__composite(crtc, region);
+ else
+ sna_crtc_redisplay__fallback(crtc, region);
}
static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
@@ -4291,8 +4294,7 @@ void sna_mode_redisplay(struct sna *sna)
if (RegionNil(region))
return;
- if (!can_render(sna) ||
- !sna_pixmap_move_to_gpu(sna->front, MOVE_READ)) {
+ if (wedged(sna) || !sna_pixmap_move_to_gpu(sna->front, MOVE_READ)) {
if (!sna_pixmap_move_to_cpu(sna->front, MOVE_READ))
return;
More information about the xorg-commit
mailing list