xf86-video-intel: src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Jan 31 07:40:05 PST 2014
src/sna/sna_accel.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit f934ee78a000815e14e36bd0caa279cb35d07bfe
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jan 31 15:39:23 2014 +0000
sna: Reorder assignments vs DBG
It helps reading the debug log if what we print is correct.
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 3a7592a..bbb6e2b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -909,17 +909,17 @@ fallback:
}
}
+ pixmap->drawable.width = width;
+ pixmap->drawable.height = height;
+ pixmap->drawable.depth = depth;
+ pixmap->drawable.bitsPerPixel = bpp;
+
DBG(("%s: serial=%ld, %dx%d\n",
__FUNCTION__,
pixmap->drawable.serialNumber,
pixmap->drawable.width,
pixmap->drawable.height));
- pixmap->drawable.width = width;
- pixmap->drawable.height = height;
- pixmap->drawable.depth = depth;
- pixmap->drawable.bitsPerPixel = bpp;
-
priv->cpu_bo = kgem_create_map(&sna->kgem, addr, pitch*height, false);
if (priv->cpu_bo == NULL) {
priv->header = true;
@@ -997,6 +997,12 @@ sna_pixmap_create_scratch(ScreenPtr screen,
}
}
+ pixmap->drawable.width = width;
+ pixmap->drawable.height = height;
+ pixmap->drawable.depth = depth;
+ pixmap->drawable.bitsPerPixel = bpp;
+ pixmap->devPrivate.ptr = NULL;
+
DBG(("%s: serial=%ld, usage=%d, %dx%d\n",
__FUNCTION__,
pixmap->drawable.serialNumber,
@@ -1004,12 +1010,6 @@ sna_pixmap_create_scratch(ScreenPtr screen,
pixmap->drawable.width,
pixmap->drawable.height));
- pixmap->drawable.width = width;
- pixmap->drawable.height = height;
- pixmap->drawable.depth = depth;
- pixmap->drawable.bitsPerPixel = bpp;
- pixmap->devPrivate.ptr = NULL;
-
priv->stride = PixmapBytePad(width, depth);
priv->header = true;
More information about the xorg-commit
mailing list