1 files changed, 11 insertions, 5 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index c45c1cfeb866..99daeed55a9b 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2400,6 +2400,14 @@ static bool skip_sample(struct trace *trace, struct perf_sample *sample)
         return false;
 }
 
+static void trace__set_base_time(struct trace *trace,
+                                 struct perf_evsel *evsel __maybe_unused,
+                                 struct perf_sample *sample)
+{
+        if (trace->base_time == 0 && !trace->full_time)
+                trace->base_time = sample->time;
+}
+
 static int trace__process_sample(struct perf_tool *tool,
                                  union perf_event *event,
                                  struct perf_sample *sample,
@@ -2414,8 +2422,7 @@ static int trace__process_sample(struct perf_tool *tool,
         if (skip_sample(trace, sample))
                 return 0;
 
-        if (!trace->full_time && trace->base_time == 0)
-                trace->base_time = sample->time;
+        trace__set_base_time(trace, evsel, sample);
 
         if (handler) {
                 ++trace->nr_events;
@@ -2553,9 +2560,6 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st
         const u32 type = event->header.type;
         struct perf_evsel *evsel;
 
-        if (!trace->full_time && trace->base_time == 0)
-                trace->base_time = sample->time;
-
         if (type != PERF_RECORD_SAMPLE) {
                 trace__process_event(trace, trace->host, event, sample);
                 return;
@@ -2567,6 +2571,8 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st
                 return;
         }
 
+        trace__set_base_time(trace, evsel, sample);
+
         if (evsel->attr.type == PERF_TYPE_TRACEPOINT &&
             sample->raw_data == NULL) {
                 fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",