Skip to contentSkip to conversation

sna: fix --enable-debug=full

PATCH New Alexei Podtelezhnikov 2 participants 2 messages Apr 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sna: fix --enable-debug=full

From: Alexei Podtelezhnikov <[email protected]>

Once a typo is fixed, the debug build triggers an assertion failure. Given that the normal build is just fine, the assert might be wrong.

---
 src/sna/compiler.h  | 2 +-
 src/sna/sna_accel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
src/sna/compiler.h +1 -1
index 2e579b15..c3d98797 100644
@@ -50,7 +50,7 @@
 #define must_check
 #define constant
 #define pure
-#define tighly_packed
+#define tightly_packed
 #define flatten
 #define nonnull
 #define page_aligned
src/sna/sna_accel.c +1 -1
index ee857a14..bf1edec8 100644
@@ -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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for sna: fix --enable-debug=full

== Series Details ==

== Series Details ==

Series: sna: fix --enable-debug=full
URL : https://patchwork.freedesktop.org/series/76002/
State : failure

== Summary ==

Applying: sna: fix --enable-debug=full
error: sha1 information is lacking or useless (src/sna/compiler.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 sna: fix --enable-debug=full
When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx