xf86-video-intel: src/sna/brw

[Chris Wilson]

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

New commits:
commit d1d14f20cfd6412adbd6f937f54c814c2a332e6f
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Fri Nov 11 09:00:15 2016 +0000

    brw_eu_emit.c: fix wrong test on a register type
    
    Caught by gcc-6 as:
        brw_eu_emit.c:180:49: warning: logical 'and' of equal expressions [-Wlogical-op]
    
        if (reg.file == BRW_ARCHITECTURE_REGISTER_FILE &&
            reg.file == BRW_ARF_NULL)
            return;
    
    Change uses 'reg.nr' test for 'BRW_ARF_NULL'.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/brw/brw_eu_emit.c b/src/sna/brw/brw_eu_emit.c
index 2f33022..154f939 100644
--- a/src/sna/brw/brw_eu_emit.c
+++ b/src/sna/brw/brw_eu_emit.c
@@ -178,7 +178,7 @@ validate_reg(struct brw_instruction *insn, struct brw_reg reg)
 	}
 
 	if (reg.file == BRW_ARCHITECTURE_REGISTER_FILE &&
-	    reg.file == BRW_ARF_NULL)
+	    reg.nr == BRW_ARF_NULL)
 		return;
 
 	assert(reg.hstride >= 0 && reg.hstride < ARRAY_SIZE(hstride_for_reg));