commit 157d59a1563b593c5c7b3491b1cb8fd68cc26327
author Craig Stout <cstout@google.com> Fri Feb 15 12:16:23 2019 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Feb 15 19:28:13 2019 +0000
tree 2f861d986d710b179ea3c368b0aa1ce5866aa884
parent 663e1bb52616f606189fdbf954ca56cafe875a7d

[magma][msd-intel-gen] Restore trace initialization

Tracing broke when we transitioned to static tracing libraries.

MA-556 #done

Test:
pixelbook:traceutil while vkcube_on_fb is running, see gpu traces

Change-Id: I98cc75989d2fea30ae8d230baebfe3c050bc4eab

garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc

diff --git a/garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc b/garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc
index cf63c2d..52f3bc9 100644
--- a/garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc
+++ b/garnet/drivers/gpu/msd-intel-gen/src/driver_entry.cc
@@ -22,6 +22,7 @@
 
 #include "magma_util/dlog.h"
 #include "msd_intel_pci_device.h"
+#include "platform_trace.h"
 #include "sys_driver/magma_driver.h"
 
 #if MAGMA_TEST_DRIVER
@@ -168,6 +169,9 @@
     if (!device->magma_driver)
         return DRET_MSG(ZX_ERR_INTERNAL, "MagmaDriver::Create failed");
 
+    if (magma::PlatformTrace::Get())
+        magma::PlatformTrace::Get()->Initialize();
+
 #if MAGMA_TEST_DRIVER
     DLOG("running magma indriver test");
     {

garnet/lib/magma/src/sys_driver/magma_entry.cc

diff --git a/garnet/lib/magma/src/sys_driver/magma_entry.cc b/garnet/lib/magma/src/sys_driver/magma_entry.cc
index ab82d75..3e939c2 100644
--- a/garnet/lib/magma/src/sys_driver/magma_entry.cc
+++ b/garnet/lib/magma/src/sys_driver/magma_entry.cc
@@ -15,6 +15,7 @@
 #include <memory>
 
 #include "magma_util/macros.h"
+#include "platform_trace.h"
 #include "sys_driver/magma_driver.h"
 #include "sys_driver/magma_system_device.h"
 
@@ -165,6 +166,9 @@
         return ZX_ERR_NO_MEMORY;
     gpu->parent_device = parent;
 
+    if (magma::PlatformTrace::Get())
+        magma::PlatformTrace::Get()->Initialize();
+
     gpu->magma_driver = MagmaDriver::Create();
 
 #if MAGMA_TEST_DRIVER