xf86-video-intel: src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Oct 10 00:33:58 PDT 2013
src/sna/kgem.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit c99d44d7f09fc92daf64eee1f6f3300e11e1cf01
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Oct 10 08:32:51 2013 +0100
sna: Prevent changes in tiling/pitch of existing framebuffers
Reported-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 7da05dd..3dcc614 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3935,22 +3935,16 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
if (size > num_pages(bo) || num_pages(bo) > 2*size)
continue;
+ if (bo->tiling != tiling || bo->pitch != pitch)
+ /* No tiling/pitch without recreating fb */
+ continue;
+
if (!check_scanout_size(kgem, bo, width, height)) {
if (first == NULL)
first = bo;
continue;
}
- if (bo->tiling != tiling ||
- (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
- if (!gem_set_tiling(kgem->fd, bo->handle,
- tiling, pitch))
- continue;
-
- bo->tiling = tiling;
- bo->pitch = pitch;
- }
-
if (flags & CREATE_INACTIVE && bo->rq) {
last = bo;
continue;
More information about the xorg-commit
mailing list