Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a978cefa authored by Jesse Hall's avatar Jesse Hall
Browse files

Update fence event path for kernel 4.10+ 

The sysfs path for controlling dma fence events changed yet again in
Linux 4.10, see kernel commit f54d1867005c3.

Test: adb shell atrace --list_categories | grep sync
Test: external/chromium-trace/systrace.py sync, check for dma_fence
      events in trace.html's event list
Change-Id: I45905cf199d5de3d5679151f19f8aa693adea5e1
parent d7d075fb

cmds/atrace/atrace.cpp

+4 −2
Original line number Diff line number Diff line
@@ -192,10 +192,12 @@ static const TracingCategory k_categories[] = { 
        { 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

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ on late-init 
    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