commit dbe6376e0035a48cdcbc073c472a5d6278acebf9
Author: Zachary Michaels <zmichaels@oblong.com>
Date:   Wed Jan 18 10:08:07 2017 -0800

    Always leave poly_offset in a valid state
    
    This commit makes si_update_poly_offset set poly_offset to NULL if
    uses_poly_offset is false. This way poly_offset either points into the
    currently queued rasterizer, or it is NULL.

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 6e7d8da..9207e30 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -717,8 +717,10 @@ static void si_update_poly_offset_state(struct si_context *sctx)
 {
 	struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
 
-	if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf)
+	if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf) {
+		si_pm4_bind_state(sctx, poly_offset, NULL);
 		return;
+	}
 
 	/* Use the user format, not db_render_format, so that the polygon
 	 * offset behaves as expected by applications.