From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 19 Sep 2017 01:50:06 +0000 (-0700)
Subject: i965: Fix batch map failure check in INTEL_DEBUG=bat handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b339d63f0d0337df918c7aed471b90c02401bdb7;p=mesa.git

i965: Fix batch map failure check in INTEL_DEBUG=bat handling.

I originally wrote the code to call the maps 'batch' and 'state',
until I remembered that 'batch' is the intel_batchbuffer struct pointer.
The NULL check was still using the wrong variable.

Caught by Coverity.

CID: 1418109
---

diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 7d5a8947e8f..6a16771fc6d 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -439,7 +439,7 @@ do_batch_dump(struct brw_context *brw)
 
    uint32_t *batch_data = brw_bo_map(brw, batch->bo, MAP_READ);
    uint32_t *state = brw_bo_map(brw, batch->state_bo, MAP_READ);
-   if (batch == NULL || state == NULL) {
+   if (batch_data == NULL || state == NULL) {
       fprintf(stderr, "WARNING: failed to map batchbuffer/statebuffer\n");
       return;
    }