xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_blt.c src/sna/sna.h src/sna/sna_render.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Aug 20 02:49:28 PDT 2012
src/sna/sna.h | 2 ++
src/sna/sna_accel.c | 37 +++++++++++++++++++++----------------
src/sna/sna_blt.c | 2 --
src/sna/sna_render.c | 3 +--
4 files changed, 24 insertions(+), 20 deletions(-)
New commits:
commit a05643eb670e91ab102465df799301def88faaf9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Aug 20 10:46:14 2012 +0100
sna: Remove unneeded source bo unref after __sna_render_pixmap_bo()
As __sna_render_pixmap_bo() deliberately does not reference its returned
bo, we need to avoid unreferencing it else we cause explosions later.
Fixes regression from commit a13781d19defc97af6a279c11a85e33ef825020e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Aug 19 09:45:12 2012 +0100
sna: Enable BLT composite functions to target CPU buffers
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index f050669..99671a9 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1850,11 +1850,9 @@ clear:
if (!tmp->dst.bo) {
DBG(("%s: fallback -- unaccelerated read back\n",
__FUNCTION__));
- kgem_bo_destroy(&sna->kgem, bo);
} else if (bo->snoop && tmp->dst.bo->snoop) {
DBG(("%s: fallback -- can not copy between snooped bo\n",
__FUNCTION__));
- kgem_bo_destroy(&sna->kgem, bo);
} else {
ret = prepare_blt_copy(sna, tmp, bo, alpha_fixup);
if (fallback)
commit c80db9bc2ef0a37a4abb78c9ef667c8b36ab6fba
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Aug 20 10:45:36 2012 +0100
sna: Flush the batch before preparing for a FlushCallback
As we end up submitting and maybe synchronising upon a batch within
FlushCallback (or our client will) it is important that we start that
serialized batch as early as possible to minimise the impending stalls.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 3c83ac5..cd55afd 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -458,6 +458,8 @@ sna_drawable_move_to_gpu(DrawablePtr drawable, unsigned flags)
return sna_pixmap_move_to_gpu(get_drawable_pixmap(drawable), flags) != NULL;
}
+void sna_add_flush_pixmap(struct sna *sna, struct sna_pixmap *priv);
+
struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling);
#define PREFER_GPU 0x1
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 04dacf1..8941be9 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1012,11 +1012,19 @@ fallback:
return create_pixmap(sna, screen, width, height, depth, usage);
}
-static inline void add_flush_pixmap(struct sna *sna, struct sna_pixmap *priv)
+void sna_add_flush_pixmap(struct sna *sna, struct sna_pixmap *priv)
{
DBG(("%s: marking pixmap=%ld for flushing\n",
__FUNCTION__, priv->pixmap->drawable.serialNumber));
list_move(&priv->list, &sna->flush_pixmaps);
+
+ if (sna->kgem.need_retire)
+ kgem_retire(&sna->kgem);
+ if (!sna->kgem.need_retire || !sna->kgem.flush) {
+ DBG(("%s: GPU idle, flushing\n", __FUNCTION__));
+ kgem_submit(&sna->kgem);
+ }
+
sna->kgem.flush = true;
}
@@ -1065,7 +1073,7 @@ static Bool sna_destroy_pixmap(PixmapPtr pixmap)
if (priv->shm && kgem_bo_is_busy(priv->cpu_bo)) {
kgem_bo_submit(&sna->kgem, priv->cpu_bo); /* XXX ShmDetach */
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
} else
__sna_free_pixmap(sna, pixmap, priv);
return TRUE;
@@ -1404,7 +1412,7 @@ skip_inplace_map:
if (priv->flush) {
assert(!priv->shm);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
@@ -2006,7 +2014,7 @@ done:
}
if (priv->flush) {
assert(!priv->shm);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
@@ -2220,7 +2228,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
box, n, 0);
if (ok && priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
if (!ok) {
@@ -2264,7 +2272,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
box, 1, 0);
if (ok && priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
if (!ok) {
@@ -2299,7 +2307,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
box, n, 0);
if (ok && priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
if (!ok) {
@@ -2325,7 +2333,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
if (priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
done:
@@ -2576,11 +2584,8 @@ use_cpu_bo:
*damage = &priv->cpu_damage;
if (priv->shm) {
- struct sna *sna = to_sna_from_pixmap(pixmap);
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
- if (!kgem_bo_is_busy(priv->cpu_bo))
- kgem_submit(&sna->kgem);
+ sna_add_flush_pixmap(to_sna_from_pixmap(pixmap), priv);
}
DBG(("%s: using CPU bo with damage? %d\n",
@@ -2802,7 +2807,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
box, n, 0);
if (ok && priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
if (!ok) {
@@ -2837,7 +2842,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
if (priv->shm) {
assert(!priv->flush);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
/* For large bo, try to keep only a single copy around */
@@ -3392,7 +3397,7 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
}
if (priv->flush) {
assert(!priv->shm);
- add_flush_pixmap(sna, priv);
+ sna_add_flush_pixmap(sna, priv);
}
}
priv->cpu = true;
@@ -4270,7 +4275,7 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
if (src_priv->shm) {
assert(!src_priv->flush);
- add_flush_pixmap(sna, src_priv);
+ sna_add_flush_pixmap(sna, src_priv);
}
if (damage)
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 7b54f23..13822b8 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -378,8 +378,7 @@ use_cpu_bo(struct sna *sna, PixmapPtr pixmap, const BoxRec *box, bool blt)
if (priv->shm) {
assert(!priv->flush);
- list_move(&priv->list, &sna->flush_pixmaps);
- sna->kgem.flush |= 1;
+ sna_add_flush_pixmap(sna, priv);
}
DBG(("%s for box=(%d, %d), (%d, %d)\n",
More information about the xorg-commit
mailing list