commit 25c5b36ab4ddfec2afae38d240447c9a80b09c50
author Jesse Hall <jessehall@google.com> Fri Mar 01 13:20:14 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Mar 01 13:20:14 2019 -0800
tree 0bc4a066a64dba31ae9ecb367bfe1d818246bd56
parent cb20ccaa611fbde0fcbade5a0b667d183c405b4f
parent f33fe4c782193ed10b839922480ed6ff0824a7e9

Merge "Update fence event path for kernel 4.10+" am: f3e024a065 am: 480610413d
am: f33fe4c782

Change-Id: Ie9816acdeabf413378ed2a2bc2a299dfeeff2492

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index bd3d2d8..5836f11 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -193,10 +193,12 @@
         { REQ,      "events/cpufreq_interactive/enable" },
     } },
     { "sync",       "Synchronization",  0, {
-        // before linux kernel 4.9
+        // linux kernel < 4.9
         { OPT,      "events/sync/enable" },
-        // starting in linux kernel 4.9
+        // linux kernel == 4.9.x
         { OPT,      "events/fence/enable" },
+        // linux kernel > 4.9
+        { OPT,      "events/dma_fence/enable" },
     } },
     { "workq",      "Kernel Workqueues", 0, {
         { REQ,      "events/workqueue/enable" },

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index a282424..66c9cc6 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -91,6 +91,8 @@
     chmod 0666 /sys/kernel/tracing/events/sync/enable
     chmod 0666 /sys/kernel/debug/tracing/events/fence/enable
     chmod 0666 /sys/kernel/tracing/events/fence/enable
+    chmod 0666 /sys/kernel/debug/tracing/events/dma_fence/enable
+    chmod 0666 /sys/kernel/tracing/events/dma_fence/enable
     chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/enable
     chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/enable
     chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_grow/enable