xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Feb 20 16:03:56 PST 2012
src/sna/kgem.c | 61 +++++++++++++++++++++++++++++++++++++++++++++-------
src/sna/sna_accel.c | 11 ++++++++-
2 files changed, 63 insertions(+), 9 deletions(-)
New commits:
commit 7ea44997553ffdf57b346dc9d83742c511c9e5a4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 20 23:50:42 2012 +0000
sna: Restore the shadow pixels when reducing CPU damage to all
Reported-by: Joe Nahmias <joe at nahmias.net>
References: https://bugs.freedesktop.org/show_bug.cgi?id=46346
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index aab85d8..c8fcc75 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1215,8 +1215,17 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
if (sna_damage_is_all(&priv->cpu_damage,
pixmap->drawable.width,
- pixmap->drawable.height))
+ pixmap->drawable.height)) {
+ sna_damage_destroy(&priv->gpu_damage);
+ sna_pixmap_free_gpu(sna, priv);
+ priv->undamaged = false;
+
+ if (pixmap->devPrivate.ptr == NULL &&
+ !sna_pixmap_alloc_cpu(sna, pixmap, priv, false))
+ return false;
+
goto out;
+ }
if (priv->clear)
return _sna_pixmap_move_to_cpu(pixmap, flags);
commit dbe0580e207ad85cb6a659f86c5746a7ecbcd036
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 20 16:30:53 2012 +0000
sna: gen4+ suffer no penalty for changing tiling
On gen4, the tiling/fence constraints are fairly lax, only requiring
page alignment of the object and its size, and so we can switch
tiling modes without incurring a GPU stall on active bo.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index f107f14..e7c4987 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -2403,15 +2403,28 @@ search_again:
assert(bo->reusable);
assert(bo->tiling == tiling);
- if (bo->pitch < pitch) {
- DBG(("tiled and pitch too small: tiling=%d, (want %d), pitch=%d, need %d\n",
- bo->tiling, tiling,
- bo->pitch, pitch));
- continue;
- }
+ if (kgem->gen < 40) {
+ if (bo->pitch < pitch) {
+ DBG(("tiled and pitch too small: tiling=%d, (want %d), pitch=%d, need %d\n",
+ bo->tiling, tiling,
+ bo->pitch, pitch));
+ continue;
+ }
- if (bo->pitch * tiled_height > bytes(bo))
- continue;
+ if (bo->pitch * tiled_height > bytes(bo))
+ continue;
+ } else {
+ if (num_pages(bo) < size)
+ continue;
+
+ if (bo->pitch != pitch) {
+ gem_set_tiling(kgem->fd,
+ bo->handle,
+ tiling, pitch);
+
+ bo->pitch = pitch;
+ }
+ }
kgem_bo_remove_from_active(kgem, bo);
@@ -2444,6 +2457,38 @@ search_again:
}
if (--retry && flags & CREATE_EXACT) {
+ if (kgem->gen >= 40) {
+ for (i = I915_TILING_NONE; i <= I915_TILING_Y; i++) {
+ if (i == tiling)
+ continue;
+
+ cache = &kgem->active[bucket][i];
+ list_for_each_entry(bo, cache, list) {
+ assert(!bo->purged);
+ assert(bo->refcnt == 0);
+ assert(bo->reusable);
+
+ if (num_pages(bo) < size)
+ continue;
+
+ if (tiling != gem_set_tiling(kgem->fd,
+ bo->handle,
+ tiling, pitch))
+ continue;
+
+ kgem_bo_remove_from_active(kgem, bo);
+
+ bo->unique_id = kgem_get_unique_id(kgem);
+ bo->pitch = pitch;
+ bo->tiling = tiling;
+ bo->delta = 0;
+ DBG((" 1:from active: pitch=%d, tiling=%d, handle=%d, id=%d\n",
+ bo->pitch, bo->tiling, bo->handle, bo->unique_id));
+ return kgem_bo_reference(bo);
+ }
+ }
+ }
+
bucket++;
goto search_again;
}
More information about the xorg-commit
mailing list