Mesa (main): freedreno/decode: print estimated crash location without colored output

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a57bcc4394d07b7f85db7fa33e2e2fd540055bee
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a57bcc4394d07b7f85db7fa33e2e2fd540055bee

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Tue Aug 10 12:24:04 2021 +0300

freedreno/decode: print estimated crash location without colored output

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12302>

---

 src/freedreno/.gitlab-ci/reference/crash.log | 1 +
 src/freedreno/decode/cffdec.c                | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/freedreno/.gitlab-ci/reference/crash.log b/src/freedreno/.gitlab-ci/reference/crash.log
index ceba6c8b554..b3332726adc 100644
--- a/src/freedreno/.gitlab-ci/reference/crash.log
+++ b/src/freedreno/.gitlab-ci/reference/crash.log
@@ -1728,6 +1728,7 @@ got cmdszdw=27
 0000000100000014:			0000: 70108000
 bad type! deadd00d
 			opcode: CP_NOP (10) (1 dwords)
+ESTIMATED CRASH LOCATION!
 0000000100000020:			0000: 70108000
 			opcode: CP_NOP (10) (1 dwords)
 0000000100000024:			0000: 70108000
diff --git a/src/freedreno/decode/cffdec.c b/src/freedreno/decode/cffdec.c
index ef7d4369371..bdae7c96cf1 100644
--- a/src/freedreno/decode/cffdec.c
+++ b/src/freedreno/decode/cffdec.c
@@ -168,9 +168,6 @@ static void dump_tex_const(uint32_t *texsamp, int num_unit, int level);
 static bool
 highlight_gpuaddr(uint64_t gpuaddr)
 {
-   if (!options->color)
-      return false;
-
    if (!options->ibs[ib].base)
       return false;
 
@@ -178,7 +175,7 @@ highlight_gpuaddr(uint64_t gpuaddr)
       return false;
 
    if (ibs[ib].triggered)
-      return true;
+      return options->color;
 
    if (options->ibs[ib].base != ibs[ib].base)
       return false;
@@ -193,7 +190,7 @@ highlight_gpuaddr(uint64_t gpuaddr)
    if (triggered)
       printf("ESTIMATED CRASH LOCATION!\n");
 
-   return triggered;
+   return triggered & options->color;
 }
 
 static void