From 1e06ddddc3d9f366b21fc5e248f91ed6ff1838e5 Mon Sep 17 00:00:00 2001 From: Nilaan Gunabalachandran Date: Fri, 19 Jul 2019 16:39:53 -0400 Subject: [PATCH] disp: msm: sde: Add event log for uidle veto enable Print uidle status fal10 enable bit as part of checking status. Change-Id: Ibe00216ac22bb31fbe0925db3abc1d5dc4371ad3 Signed-off-by: Nilaan Gunabalachandran --- msm/sde/sde_encoder.c | 4 +++- msm/sde/sde_hw_uidle.c | 5 +++++ msm/sde/sde_hw_uidle.h | 2 ++ msm/sde/sde_trace.h | 22 ++++++++++++++++------ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c index 7e181346fc..ab61899467 100644 --- a/msm/sde/sde_encoder.c +++ b/msm/sde/sde_encoder.c @@ -3496,7 +3496,9 @@ void sde_encoder_perf_uidle_status(struct sde_kms *sde_kms, status.uidle_idle_status_0, status.uidle_idle_status_1, status.uidle_fal_status_0, - status.uidle_fal_status_1); + status.uidle_fal_status_1, + status.uidle_status, + status.uidle_en_fal10); } if ((sde_kms->catalog->uidle_cfg.debugfs_perf & SDE_PERF_UIDLE_CNT) diff --git a/msm/sde/sde_hw_uidle.c b/msm/sde/sde_hw_uidle.c index 5d17f415bd..f1a8a8b1f7 100644 --- a/msm/sde/sde_hw_uidle.c +++ b/msm/sde/sde_hw_uidle.c @@ -85,6 +85,11 @@ void sde_hw_uidle_get_status(struct sde_hw_uidle *uidle, SDE_REG_READ(c, UIDLE_FAL_STATUS_0); status->uidle_fal_status_1 = SDE_REG_READ(c, UIDLE_FAL_STATUS_1); + + status->uidle_status = + SDE_REG_READ(c, UIDLE_STATUS); + status->uidle_en_fal10 = + (status->uidle_status & BIT(2)) ? 1 : 0; } void sde_hw_uidle_get_cntr(struct sde_hw_uidle *uidle, diff --git a/msm/sde/sde_hw_uidle.h b/msm/sde/sde_hw_uidle.h index 2f660894ca..de3d7165fe 100644 --- a/msm/sde/sde_hw_uidle.h +++ b/msm/sde/sde_hw_uidle.h @@ -59,6 +59,8 @@ struct sde_uidle_status { u32 uidle_idle_status_1; u32 uidle_fal_status_0; u32 uidle_fal_status_1; + u32 uidle_status; + u32 uidle_en_fal10; }; struct sde_hw_uidle_ops { diff --git a/msm/sde/sde_trace.h b/msm/sde/sde_trace.h index aec3e6ac38..9a8f414aa0 100644 --- a/msm/sde/sde_trace.h +++ b/msm/sde/sde_trace.h @@ -357,7 +357,9 @@ TRACE_EVENT(sde_perf_uidle_status, u32 uidle_idle_status_0, u32 uidle_idle_status_1, u32 uidle_fal_status_0, - u32 uidle_fal_status_1), + u32 uidle_fal_status_1, + u32 uidle_status, + u32 uidle_en_fal10), TP_ARGS(crtc, uidle_danger_status_0, uidle_danger_status_1, @@ -366,7 +368,9 @@ TRACE_EVENT(sde_perf_uidle_status, uidle_idle_status_0, uidle_idle_status_1, uidle_fal_status_0, - uidle_fal_status_1), + uidle_fal_status_1, + uidle_status, + uidle_en_fal10), TP_STRUCT__entry( __field(u32, crtc) __field(u32, uidle_danger_status_0) @@ -376,7 +380,9 @@ TRACE_EVENT(sde_perf_uidle_status, __field(u32, uidle_idle_status_0) __field(u32, uidle_idle_status_1) __field(u32, uidle_fal_status_0) - __field(u32, uidle_fal_status_1)), + __field(u32, uidle_fal_status_1) + __field(u32, uidle_status) + __field(u32, uidle_en_fal10)), TP_fast_assign( __entry->crtc = crtc; __entry->uidle_danger_status_0 = uidle_danger_status_0; @@ -386,9 +392,11 @@ TRACE_EVENT(sde_perf_uidle_status, __entry->uidle_idle_status_0 = uidle_idle_status_0; __entry->uidle_idle_status_1 = uidle_idle_status_1; __entry->uidle_fal_status_0 = uidle_fal_status_0; - __entry->uidle_fal_status_1 = uidle_fal_status_1;), + __entry->uidle_fal_status_1 = uidle_fal_status_1; + __entry->uidle_status = uidle_status; + __entry->uidle_en_fal10 = uidle_en_fal10;), TP_printk( - "crtc:%d danger[%d, %d] safe[%d, %d] idle[%d, %d] fal[%d, %d]", + "crtc:%d danger[%d, %d] safe[%d, %d] idle[%d, %d] fal[%d, %d] status:%d en_fal10:%d", __entry->crtc, __entry->uidle_danger_status_0, __entry->uidle_danger_status_1, @@ -397,7 +405,9 @@ TRACE_EVENT(sde_perf_uidle_status, __entry->uidle_idle_status_0, __entry->uidle_idle_status_1, __entry->uidle_fal_status_0, - __entry->uidle_fal_status_1 + __entry->uidle_fal_status_1, + __entry->uidle_status, + __entry->uidle_en_fal10 ) );