From 0250a4f4ba5b765fe4e9be585e03c92aa2376402 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 May 2014 12:40:01 +0100 Subject: [PATCH] sna: Fix bogus assertion about conn->encoder_id The connector's encoder_id is only set if the output is active. Signed-off-by: Chris Wilson --- src/sna/sna_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 4632019c..5ce967cb 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -2813,7 +2813,7 @@ sna_output_add(struct sna *sna, int id, int serial) } possible_crtcs = enc.possible_crtcs; - assert(enc.encoder_id = compat_conn.conn.encoder_id); + assert(enc.encoder_id = compat_conn.conn.encoder_id || compat_conn.conn.encoder_id == 0); } else { DBG(("%s: unexpected number [%d] of encoders attached\n", __FUNCTION__, compat_conn.conn.count_encoders));