Mesa (master): intel/aub_viewer: fix shader get_bo

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8e2fda411a4f822600e875b05ac744c1fd3b2620
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e2fda411a4f822600e875b05ac744c1fd3b2620

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Fri Sep 14 21:19:21 2018 +0100

intel/aub_viewer: fix shader get_bo

Instruction addresses are always in ppgtt space.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/intel/tools/aubinator_viewer.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index 085ef75555..47eba274da 100644
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/src/intel/tools/aubinator_viewer.cpp
@@ -387,12 +387,8 @@ new_shader_window(struct aub_mem *mem, uint64_t address, const char *desc)
    window->base.display = display_shader_window;
    window->base.destroy = destroy_shader_window;
 
-   struct gen_batch_decode_bo shader_bo;
-   if (mem->pml4)
-      shader_bo = aub_mem_get_ppgtt_bo(mem, address);
-   else
-      shader_bo = aub_mem_get_ggtt_bo(mem, address);
-
+   struct gen_batch_decode_bo shader_bo =
+      aub_mem_get_ppgtt_bo(mem, address);
    if (shader_bo.map) {
       FILE *f = open_memstream(&window->shader, &window->shader_size);
       if (f) {