xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_render.c

[Chris Wilson]

 src/sna/sna_accel.c  |   11 ++++++++++-
 src/sna/sna_render.c |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 74c912880c302889f38fe5898c8038a0ba20e5db
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 31 10:57:54 2012 +0000

    sna: Fix a typo in a DBG
    
    Reported-by: Matti Ruohonen <kiesus at gmail.com>
    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 fed08cb..a6af3f1 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2359,7 +2359,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
 	struct sna_pixmap *priv = sna_pixmap(pixmap);
 	RegionRec i, r;
 
-	DBG(("%s: pixmap=%ld box=(%d, %d), (%d, %d), flags=%lx\n",
+	DBG(("%s: pixmap=%ld box=(%d, %d), (%d, %d), flags=%x\n",
 	     __FUNCTION__, pixmap->drawable.serialNumber,
 	     box->x1, box->y1, box->x2, box->y2, flags));
 
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index d101224..3cb1449 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1334,7 +1334,7 @@ sna_render_picture_flatten(struct sna *sna,
 	assert(w <= sna->render.max_3d_size && h <= sna->render.max_3d_size);
 
 	/* XXX shortcut a8? */
-	DBG(("%s: %dx%d\n", __FUNCION__, w, h));
+	DBG(("%s: %dx%d\n", __FUNCTION__, w, h));
 
 	pixmap = screen->CreatePixmap(screen, w, h, 32, SNA_CREATE_SCRATCH);
 	if (pixmap == NullPixmap)
commit f48a821aa73cb40a51baafc6cd2b063f1f91d864
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 31 10:53:47 2012 +0000

    sna: Add a few DBG tracepoints to screen init/fini
    
    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 89cee2a..fed08cb 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -14130,6 +14130,8 @@ static bool sna_picture_init(ScreenPtr screen)
 {
 	PictureScreenPtr ps;
 
+	DBG(("%s\n", __FUNCTION__));
+
 	if (!miPictureInit(screen, NULL, 0))
 		return false;
 
@@ -14157,6 +14159,8 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
 {
 	const char *backend;
 
+	DBG(("%s\n", __FUNCTION__));
+
 	sna_font_key = AllocateFontPrivateIndex();
 
 	list_init(&sna->flush_pixmaps);
@@ -14265,6 +14269,8 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
 
 void sna_accel_create(struct sna *sna)
 {
+	DBG(("%s\n", __FUNCTION__));
+
 	if (!sna_glyphs_create(sna))
 		goto fail;
 
@@ -14303,6 +14309,8 @@ void sna_accel_watch_flush(struct sna *sna, int enable)
 
 void sna_accel_close(struct sna *sna)
 {
+	DBG(("%s\n", __FUNCTION__));
+
 	sna_composite_close(sna);
 	sna_gradients_close(sna);
 	sna_glyphs_close(sna);
@@ -14395,4 +14403,5 @@ void sna_accel_wakeup_handler(struct sna *sna)
 
 void sna_accel_free(struct sna *sna)
 {
+	DBG(("%s\n", __FUNCTION__));
 }