drm/msm/dpu: stop using raw IRQ indices in the kernel traces

In preparation to reworking IRQ indcies, stop using raw indices in
kernel traces. Instead use a pair of register index and bit. This
corresponds closer to the values in HW catalog.

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/550935/
Link: https://lore.kernel.org/r/20230802100426.4184892-8-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 5e1b67f161ce9c582d4c487582416db55f9a6dec..7b1fc8099aa2dbb76d941a7652a0de331e1ab6c7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -409,7 +409,7 @@ int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
        } else {
                ret = 0;
                trace_dpu_enc_irq_wait_success(DRMID(phys_enc->parent),
-                       func, irq_idx,
+                       func, DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),
                        phys_enc->hw_pp->idx - PINGPONG_0,
                        atomic_read(wait_info->atomic_cnt));
        }
@@ -1550,7 +1550,9 @@ static int dpu_encoder_helper_wait_event_timeout(
                                atomic_read(info->atomic_cnt) == 0, jiffies);
                time = ktime_to_ms(ktime_get());
 
-               trace_dpu_enc_wait_event_timeout(drm_id, irq_idx, rc, time,
+               trace_dpu_enc_wait_event_timeout(drm_id,
+                                                DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),
+                                                rc, time,
                                                 expected_time,
                                                 atomic_read(info->atomic_cnt));
        /* If we timed out, counter is valid and time is less, wait again */

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
index c413e9917d7eb1ff285e655ddfde964581cd5fbb..f85558f257f34a62a2821c8f537a16592647f606 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
@@ -546,7 +546,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
                return -EBUSY;
        }
 
-       trace_dpu_core_irq_register_callback(irq_idx, irq_cb);
+       trace_dpu_core_irq_register_callback(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
        irq_entry->arg = irq_arg;
        irq_entry->cb = irq_cb;
 
@@ -558,7 +558,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
                          DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
        spin_unlock_irqrestore(&dpu_kms->hw_intr->irq_lock, irq_flags);
 
-       trace_dpu_irq_register_success(irq_idx);
+       trace_dpu_irq_register_success(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
 
        return 0;
 }
@@ -579,7 +579,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx)
             DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
 
        spin_lock_irqsave(&dpu_kms->hw_intr->irq_lock, irq_flags);
-       trace_dpu_core_irq_unregister_callback(irq_idx);
+       trace_dpu_core_irq_unregister_callback(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
 
        ret = dpu_hw_intr_disable_irq_locked(dpu_kms->hw_intr, irq_idx);
        if (ret)
@@ -592,7 +592,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx)
 
        spin_unlock_irqrestore(&dpu_kms->hw_intr->irq_lock, irq_flags);
 
-       trace_dpu_irq_unregister_success(irq_idx);
+       trace_dpu_irq_unregister_success(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
 
        return 0;
 }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
index c74b9be25e6801906417d9e02a9d34bd29856add..35d03b121a0b410e395f5ce16ead28c084c4405a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
@@ -168,46 +168,50 @@ TRACE_EVENT(dpu_perf_crtc_update,
 );
 
 DECLARE_EVENT_CLASS(dpu_irq_template,
-       TP_PROTO(int irq_idx),
-       TP_ARGS(irq_idx),
+       TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
+       TP_ARGS(irq_reg, irq_bit),
        TP_STRUCT__entry(
-               __field(        int,                    irq_idx         )
+               __field(        unsigned int,           irq_reg         )
+               __field(        unsigned int,           irq_bit         )
        ),
        TP_fast_assign(
-               __entry->irq_idx = irq_idx;
+               __entry->irq_reg = irq_reg;
+               __entry->irq_bit = irq_bit;
        ),
-       TP_printk("irq=%d", __entry->irq_idx)
+       TP_printk("IRQ=[%d, %d]", __entry->irq_reg, __entry->irq_bit)
 );
 DEFINE_EVENT(dpu_irq_template, dpu_irq_register_success,
-       TP_PROTO(int irq_idx),
-       TP_ARGS(irq_idx)
+       TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
+       TP_ARGS(irq_reg, irq_bit)
 );
 DEFINE_EVENT(dpu_irq_template, dpu_irq_unregister_success,
-       TP_PROTO(int irq_idx),
-       TP_ARGS(irq_idx)
+       TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
+       TP_ARGS(irq_reg, irq_bit)
 );
 
 TRACE_EVENT(dpu_enc_irq_wait_success,
        TP_PROTO(uint32_t drm_id, void *func,
-                int irq_idx, enum dpu_pingpong pp_idx, int atomic_cnt),
-       TP_ARGS(drm_id, func, irq_idx, pp_idx, atomic_cnt),
+                unsigned int irq_reg, unsigned int irq_bit, enum dpu_pingpong pp_idx, int atomic_cnt),
+       TP_ARGS(drm_id, func, irq_reg, irq_bit, pp_idx, atomic_cnt),
        TP_STRUCT__entry(
                __field(        uint32_t,               drm_id          )
                __field(        void *,                 func            )
-               __field(        int,                    irq_idx         )
+               __field(        unsigned int,           irq_reg         )
+               __field(        unsigned int,           irq_bit         )
                __field(        enum dpu_pingpong,      pp_idx          )
                __field(        int,                    atomic_cnt      )
        ),
        TP_fast_assign(
                __entry->drm_id = drm_id;
                __entry->func = func;
-               __entry->irq_idx = irq_idx;
+               __entry->irq_reg = irq_reg;
+               __entry->irq_bit = irq_bit;
                __entry->pp_idx = pp_idx;
                __entry->atomic_cnt = atomic_cnt;
        ),
-       TP_printk("id=%u, callback=%ps, irq=%d, pp=%d, atomic_cnt=%d",
+       TP_printk("id=%u, callback=%ps, IRQ=[%d, %d], pp=%d, atomic_cnt=%d",
                  __entry->drm_id, __entry->func,
-                 __entry->irq_idx, __entry->pp_idx, __entry->atomic_cnt)
+                 __entry->irq_reg, __entry->irq_bit, __entry->pp_idx, __entry->atomic_cnt)
 );
 
 DECLARE_EVENT_CLASS(dpu_drm_obj_template,
@@ -484,12 +488,13 @@ DEFINE_EVENT(dpu_id_event_template, dpu_crtc_frame_event_more_pending,
 );
 
 TRACE_EVENT(dpu_enc_wait_event_timeout,
-       TP_PROTO(uint32_t drm_id, int irq_idx, int rc, s64 time,
+       TP_PROTO(uint32_t drm_id, unsigned int irq_reg, unsigned int irq_bit, int rc, s64 time,
                 s64 expected_time, int atomic_cnt),
-       TP_ARGS(drm_id, irq_idx, rc, time, expected_time, atomic_cnt),
+       TP_ARGS(drm_id, irq_reg, irq_bit, rc, time, expected_time, atomic_cnt),
        TP_STRUCT__entry(
                __field(        uint32_t,       drm_id          )
-               __field(        int,            irq_idx         )
+               __field(        unsigned int,   irq_reg         )
+               __field(        unsigned int,   irq_bit         )
                __field(        int,            rc              )
                __field(        s64,            time            )
                __field(        s64,            expected_time   )
@@ -497,14 +502,15 @@ TRACE_EVENT(dpu_enc_wait_event_timeout,
        ),
        TP_fast_assign(
                __entry->drm_id = drm_id;
-               __entry->irq_idx = irq_idx;
+               __entry->irq_reg = irq_reg;
+               __entry->irq_bit = irq_bit;
                __entry->rc = rc;
                __entry->time = time;
                __entry->expected_time = expected_time;
                __entry->atomic_cnt = atomic_cnt;
        ),
-       TP_printk("id=%u, irq_idx=%d, rc=%d, time=%lld, expected=%lld cnt=%d",
-                 __entry->drm_id, __entry->irq_idx, __entry->rc, __entry->time,
+       TP_printk("id=%u, IRQ=[%d, %d], rc=%d, time=%lld, expected=%lld cnt=%d",
+                 __entry->drm_id, __entry->irq_reg, __entry->irq_bit, __entry->rc, __entry->time,
                  __entry->expected_time, __entry->atomic_cnt)
 );
 
@@ -863,30 +869,34 @@ TRACE_EVENT(dpu_intf_connect_ext_te,
 );
 
 TRACE_EVENT(dpu_core_irq_register_callback,
-       TP_PROTO(int irq_idx, void *callback),
-       TP_ARGS(irq_idx, callback),
+       TP_PROTO(unsigned int irq_reg, unsigned int irq_bit, void *callback),
+       TP_ARGS(irq_reg, irq_bit, callback),
        TP_STRUCT__entry(
-               __field(        int,                            irq_idx )
+               __field(        unsigned int,                   irq_reg )
+               __field(        unsigned int,                   irq_bit )
                __field(        void *,                         callback)
        ),
        TP_fast_assign(
-               __entry->irq_idx = irq_idx;
+               __entry->irq_reg = irq_reg;
+               __entry->irq_bit = irq_bit;
                __entry->callback = callback;
        ),
-       TP_printk("irq_idx:%d callback:%ps", __entry->irq_idx,
+       TP_printk("IRQ=[%d, %d] callback:%ps", __entry->irq_reg, __entry->irq_bit,
                  __entry->callback)
 );
 
 TRACE_EVENT(dpu_core_irq_unregister_callback,
-       TP_PROTO(int irq_idx),
-       TP_ARGS(irq_idx),
+       TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
+       TP_ARGS(irq_reg, irq_bit),
        TP_STRUCT__entry(
-               __field(        int,                            irq_idx )
+               __field(        unsigned int,                   irq_reg )
+               __field(        unsigned int,                   irq_bit )
        ),
        TP_fast_assign(
-               __entry->irq_idx = irq_idx;
+               __entry->irq_reg = irq_reg;
+               __entry->irq_bit = irq_bit;
        ),
-       TP_printk("irq_idx:%d", __entry->irq_idx)
+       TP_printk("IRQ=[%d, %d]", __entry->irq_reg, __entry->irq_bit)
 );
 
 TRACE_EVENT(dpu_core_perf_update_clk,