diff --git a/src/mesa/drivers/dri/i965/brw_batch.c b/src/mesa/drivers/dri/i965/brw_batch.c
index 930f8de2e95..2c6e80ec706 100644
--- a/src/mesa/drivers/dri/i965/brw_batch.c
+++ b/src/mesa/drivers/dri/i965/brw_batch.c
@@ -93,9 +93,9 @@ decode_get_bo(void *v_brw, bool ppgtt, uint64_t address)
 
       if (address >= bo_address && address < bo_address + bo->size) {
          return (struct intel_batch_decode_bo) {
-            .addr = address,
+            .addr = bo_address,
             .size = bo->size,
-            .map = brw_bo_map(brw, bo, MAP_READ) + (address - bo_address),
+            .map = brw_bo_map(brw, bo, MAP_READ),
          };
       }
    }