Mesa (master): i965: Fix General and Indirect Base Addresses on Broadwell.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: 35e8de383cec285fbc9cf6dfc514fc7ea9b42ba7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35e8de383cec285fbc9cf6dfc514fc7ea9b42ba7

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Feb  3 14:30:39 2014 -0800

i965: Fix General and Indirect Base Addresses on Broadwell.

I set the "address modify enable" bit in the wrong DWord.  The first
DWord is the high 16 bits of the address, while the second is the low
32-bits and enable bit.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/i965/gen8_misc_state.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen8_misc_state.c b/src/mesa/drivers/dri/i965/gen8_misc_state.c
index ddc65a8..72ac2b2 100644
--- a/src/mesa/drivers/dri/i965/gen8_misc_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_misc_state.c
@@ -36,8 +36,8 @@ static void upload_state_base_address(struct brw_context *brw)
    BEGIN_BATCH(16);
    OUT_BATCH(CMD_STATE_BASE_ADDRESS << 16 | (16 - 2));
    /* General state base address: stateless DP read/write requests */
-   OUT_BATCH(1);
    OUT_BATCH(0);
+   OUT_BATCH(1);
    OUT_BATCH(0);
    /* Surface state base address: */
    OUT_RELOC64(brw->batch.bo, I915_GEM_DOMAIN_SAMPLER, 0, 1);
@@ -45,8 +45,8 @@ static void upload_state_base_address(struct brw_context *brw)
    OUT_RELOC64(brw->batch.bo,
                I915_GEM_DOMAIN_RENDER | I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
    /* Indirect object base address: MEDIA_OBJECT data */
-   OUT_BATCH(1);
    OUT_BATCH(0);
+   OUT_BATCH(1);
    /* Instruction base address: shader kernels (incl. SIP) */
    OUT_RELOC64(brw->cache.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);