From 8a5f2dc62b41f5fbb4bbdc6a77e04caed84842ac Mon Sep 17 00:00:00 2001 From: Pekka Pessi Date: Mon, 10 Oct 2022 13:21:04 +0300 Subject: [PATCH] rtcpu: fix isp event tracing The capture sequence and program sequence fields were swapped in the ISP event traces. CID 10160560 Bug 3745813 Bug 3597603 Change-Id: I5ef4751968c90b0be92a139215b80617c6d4dad2 Signed-off-by: Pekka Pessi Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2844422 Reviewed-by: svcacv Reviewed-by: Semi Malinen Reviewed-by: Sachin Nikam GVS: Gerrit_Virtual_Submit --- include/trace/events/tegra_capture.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/trace/events/tegra_capture.h b/include/trace/events/tegra_capture.h index 40e732d7..9f55c928 100644 --- a/include/trace/events/tegra_capture.h +++ b/include/trace/events/tegra_capture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -118,9 +118,9 @@ DECLARE_EVENT_CLASS(capture__progress_event, ); DECLARE_EVENT_CLASS(capture__isp_event, - TP_PROTO(u64 ts, u32 channel_id, u32 prog_sequence, u32 cap_sequence, + TP_PROTO(u64 ts, u32 channel_id, u32 cap_sequence, u32 prog_sequence, u8 isp_settings_id, u8 vi_channel_id), - TP_ARGS(ts, channel_id, prog_sequence, cap_sequence, isp_settings_id, vi_channel_id), + TP_ARGS(ts, channel_id, cap_sequence, prog_sequence, isp_settings_id, vi_channel_id), TP_STRUCT__entry( __field(u64, ts) __field(u32, channel_id) @@ -180,21 +180,21 @@ DEFINE_EVENT(capture__progress_event, capture_event_reschedule, ); DEFINE_EVENT(capture__isp_event, capture_event_reschedule_isp, - TP_PROTO(u64 ts, u32 channel_id, u32 prog_sequence, u32 cap_sequence, + TP_PROTO(u64 ts, u32 channel_id, u32 cap_sequence, u32 prog_sequence, u8 isp_settings_id, u8 vi_channel_id), - TP_ARGS(ts, channel_id, prog_sequence, cap_sequence, isp_settings_id, vi_channel_id) + TP_ARGS(ts, channel_id, cap_sequence, prog_sequence, isp_settings_id, vi_channel_id) ); DEFINE_EVENT(capture__isp_event, capture_event_isp_done, - TP_PROTO(u64 ts, u32 channel_id, u32 prog_sequence, u32 cap_sequence, + TP_PROTO(u64 ts, u32 channel_id, u32 cap_sequence, u32 prog_sequence, u8 isp_settings_id, u8 vi_channel_id), - TP_ARGS(ts, channel_id, prog_sequence, cap_sequence, isp_settings_id, vi_channel_id) + TP_ARGS(ts, channel_id, cap_sequence, prog_sequence, isp_settings_id, vi_channel_id) ); DEFINE_EVENT(capture__isp_event, capture_event_isp_error, - TP_PROTO(u64 ts, u32 channel_id, u32 prog_sequence, u32 cap_sequence, + TP_PROTO(u64 ts, u32 channel_id, u32 cap_sequence, u32 prog_sequence, u8 isp_settings_id, u8 vi_channel_id), - TP_ARGS(ts, channel_id, prog_sequence, cap_sequence, isp_settings_id, vi_channel_id) + TP_ARGS(ts, channel_id, cap_sequence, prog_sequence, isp_settings_id, vi_channel_id) ); DEFINE_EVENT(capture__progress_event, capture_event_report_program,