From e24a710c1e3e034fe0b379d0ddcda5a44ef05c83 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Wed, 20 Sep 2023 17:08:47 -0700
Subject: [PATCH] freedreno/decode: Remove gpu_id

Now unused.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25333>
---
 src/freedreno/decode/cffdec.h   | 1 -
 src/freedreno/decode/cffdump.c  | 6 +-----
 src/freedreno/decode/crashdec.c | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/freedreno/decode/cffdec.h b/src/freedreno/decode/cffdec.h
index 7ef0688..635408a 100644
--- a/src/freedreno/decode/cffdec.h
+++ b/src/freedreno/decode/cffdec.h
@@ -47,7 +47,6 @@ enum query_mode {
 struct cffdec_options {
    struct fd_dev_id dev_id;
    const struct fd_dev_info *info;
-   unsigned gpu_id;
    int draw_filter;
    int color;
    int dump_shaders;
diff --git a/src/freedreno/decode/cffdump.c b/src/freedreno/decode/cffdump.c
index 6a9b2df..4aed4e1 100644
--- a/src/freedreno/decode/cffdump.c
+++ b/src/freedreno/decode/cffdump.c
@@ -50,9 +50,7 @@
 #include "script.h"
 #include "rdutil.h"
 
-static struct cffdec_options options = {
-   .gpu_id = 220,
-};
+static struct cffdec_options options;
 
 static bool needs_wfi = false;
 static bool is_blob = false;
@@ -342,7 +340,6 @@ handle_file(const char *filename, int start, int end, int draw)
             options.info = fd_dev_info(&options.dev_id);
             if (!options.info)
                break;
-            options.gpu_id = options.info->chip * 100;
 
             cffdec_init(&options);
             got_gpu_id = 1;
@@ -356,7 +353,6 @@ handle_file(const char *filename, int start, int end, int draw)
             options.info = fd_dev_info(&options.dev_id);
             if (!options.info)
                break;
-            options.gpu_id = options.info->chip * 100;
 
             cffdec_init(&options);
             got_gpu_id = 1;
diff --git a/src/freedreno/decode/crashdec.c b/src/freedreno/decode/crashdec.c
index 9ff6741..b2f97c2 100644
--- a/src/freedreno/decode/crashdec.c
+++ b/src/freedreno/decode/crashdec.c
@@ -777,8 +777,6 @@ decode(void)
             break;
          }
 
-         options.gpu_id = options.dev_id.gpu_id;
-
          printf("Got chip_id=0x%"PRIx64"\n", options.dev_id.chip_id);
 
          cffdec_init(&options);
-- 
2.7.4