[patch xf86-video-intel] sna: fix --enable-debug=full

Alexei Podtelezhnikov apodtele at gmail.com
Fri Apr 17 02:44:02 UTC 2020


First a typo prevents linking
        src/sna/sna_render.h:164: multiple definition of `tightly_packed'

Then spurious assertion failure happens
        sna_accel_flush:17413 assertion '!ret || priv->gpu_bo == NULL' failed

Both are fixed below.

Signed-off-by: Alexei Podtelezhnikov <apodtele at gmail.com>
---
 src/sna/compiler.h  | 2 +-
 src/sna/sna_accel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sna/compiler.h b/src/sna/compiler.h
index 2e579b15..c3d98797 100644
--- a/src/sna/compiler.h
+++ b/src/sna/compiler.h
@@ -50,7 +50,7 @@
 #define must_check
 #define constant
 #define pure
-#define tighly_packed
+#define tightly_packed
 #define flatten
 #define nonnull
 #define page_aligned
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index ee857a14..bf1edec8 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -17410,7 +17410,7 @@ void sna_accel_flush(struct sna *sna)
 			assert(!priv->flush);
 			ret = sna_pixmap_move_to_cpu(priv->pixmap,
 						     MOVE_READ | MOVE_WRITE);
-			assert(!ret || priv->gpu_bo == NULL);
+			assert(ret || priv->gpu_bo == NULL);
 			if (priv->pixmap->refcnt == 0) {
 				sna_damage_destroy(&priv->cpu_damage);
 				__sna_free_pixmap(sna, priv->pixmap, priv);
--
2.26


More information about the intel-gfx-bugs mailing list