diff --git a/src/sna/compiler.h b/src/sna/compiler.h
index ff412179..44d17dbd 100644
--- a/src/sna/compiler.h
+++ b/src/sna/compiler.h
@@ -39,6 +39,7 @@
 #define pure __attribute__((pure))
 #define tightly_packed __attribute__((__packed__))
 #define flatten __attribute__((flatten))
+#define nonnull __attribute__((nonnull))
 #define page_aligned __attribute__((aligned(4096)))
 #else
 #define likely(expr) (expr)
@@ -51,6 +52,7 @@
 #define pure
 #define tighly_packed
 #define flatten
+#define nonnull
 #define page_aligned
 #endif
 
diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index fa450b41..482c6003 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -124,9 +124,8 @@ inline static bool force_blt_ring(struct sna *sna)
 	return false;
 }
 
-inline static bool prefer_blt_ring(struct sna *sna,
-				   struct kgem_bo *bo,
-				   unsigned flags)
+nonnull inline static bool
+prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
 {
 	if (PREFER_RENDER)
 		return PREFER_RENDER < 0;
@@ -137,8 +136,8 @@ inline static bool prefer_blt_ring(struct sna *sna,
 	return can_switch_to_blt(sna, bo, flags);
 }
 
-inline static bool prefer_render_ring(struct sna *sna,
-				      struct kgem_bo *bo)
+nonnull inline static bool
+prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
 {
 	if (sna->flags & SNA_POWERSAVE)
 		return false;
@@ -176,9 +175,8 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
 		prefer_blt_bo(sna, tmp->src.bo, false));
 }
 
-static inline bool prefer_blt_fill(struct sna *sna,
-				   struct kgem_bo *bo,
-				   unsigned flags)
+nonnull static inline bool
+prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
 {
 	if (PREFER_RENDER)
 		return PREFER_RENDER < 0;