From: Chia-I Wu <olvaffe@gmail.com>
Date: Thu, 22 Aug 2013 06:53:11 +0000 (+0800)
Subject: ilo: fix a potential issue with STATE_SIP
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=627d7ca7631c6835f22f2f945c11abba24a650e4;p=mesa.git

ilo: fix a potential issue with STATE_SIP

Command length is ORed to the wrong place.  Since the ORed value is zero,
there is no real change.
---

diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
index f9bffa9d4d2..8f005e95fba 100644
--- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h
+++ b/src/gallium/drivers/ilo/ilo_gpe_gen6.h
@@ -432,8 +432,8 @@ gen6_emit_STATE_SIP(const struct ilo_dev_info *dev,
 
    ILO_GPE_VALID_GEN(dev, 6, 7);
 
-   ilo_cp_begin(cp, cmd_len | (cmd_len - 2));
-   ilo_cp_write(cp, cmd);
+   ilo_cp_begin(cp, cmd_len);
+   ilo_cp_write(cp, cmd | (cmd_len - 2));
    ilo_cp_write(cp, sip);
    ilo_cp_end(cp);
 }