xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0250a4f4ba5b765fe4e9be585e03c92aa2376402
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 7 12:40:01 2014 +0100

    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 <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 4632019..5ce967c 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));