From 8e397212544f358c283badd0f65b83c4be91b5fd Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 17 Apr 2020 15:31:18 -0700
Subject: [PATCH] Revert "intel/compiler: Silence unused parameter warning in
 update_inst_scoreboard"

This was a placeholder for the XeHP cross-pipeline synchronization
code, bring it back.

This reverts commit a80e44902f66244d257c523afe77558cf334d624.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10000>
(cherry picked from commit 78b643fb7f7ad6f48062714a23b0d6d9f213c8cb)
---
 .pick_status.json                        | 2 +-
 src/intel/compiler/brw_fs_scoreboard.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9e2e53b1604..8da10862c85 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -688,7 +688,7 @@
         "description": "Revert \"intel/compiler: Silence unused parameter warning in update_inst_scoreboard\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a80e44902f66244d257c523afe77558cf334d624"
     },
diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp
index 9f7b78b78cc..b8c15d4af88 100644
--- a/src/intel/compiler/brw_fs_scoreboard.cpp
+++ b/src/intel/compiler/brw_fs_scoreboard.cpp
@@ -791,7 +791,7 @@ namespace {
     * instruction \p inst.
     */
    void
-   update_inst_scoreboard(const ordered_address *jps,
+   update_inst_scoreboard(const fs_visitor *shader, const ordered_address *jps,
                           const fs_inst *inst, unsigned ip, scoreboard &sb)
    {
       const bool exec_all = inst->force_writemask_all;
@@ -844,7 +844,7 @@ namespace {
       unsigned ip = 0;
 
       foreach_block_and_inst(block, fs_inst, inst, shader->cfg)
-         update_inst_scoreboard(jps, inst, ip++, sbs[block->num]);
+         update_inst_scoreboard(shader, jps, inst, ip++, sbs[block->num]);
 
       return sbs;
    }
@@ -944,7 +944,7 @@ namespace {
             }
          }
 
-         update_inst_scoreboard(jps, inst, ip, sb);
+         update_inst_scoreboard(shader, jps, inst, ip, sb);
          ip++;
       }