drm/msm: dpu: Remove vblank_requested flag from dpu_crtc

It's just for debugfs output, we don't need it

Changes in v2:
- None

Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 995d11e69365d8c59e0c6469a818cad7d8834941..7c6262136aa31c1ced2eb3b5000c14b7c39cd614 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1176,10 +1176,6 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
                dpu_encoder_toggle_vblank_for_crtc(enc, crtc, en);
        }
 
-       mutex_lock(&dpu_crtc->crtc_lock);
-       dpu_crtc->vblank_requested = en;
-       mutex_unlock(&dpu_crtc->crtc_lock);
-
        return 0;
 }
 
@@ -1295,8 +1291,6 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
                dpu_crtc->vblank_cb_time = ktime_set(0, 0);
        }
 
-       seq_printf(s, "vblank_enable:%d\n", dpu_crtc->vblank_requested);
-
        mutex_unlock(&dpu_crtc->crtc_lock);
        drm_modeset_unlock_all(crtc->dev);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
index fee29d1a84f641c7b00c2e52dd710051debfd0e6..0b58a2f161e00ef14d2b261b069be889eadfb06f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
@@ -132,7 +132,6 @@ struct dpu_crtc_frame_event {
  * @vblank_cb_count : count of vblank callback since last reset
  * @play_count    : frame count between crtc enable and disable
  * @vblank_cb_time  : ktime at vblank count reset
- * @vblank_requested : whether the user has requested vblank events
  * @enabled       : whether the DPU CRTC is currently enabled. updated in the
  *                  commit-thread, not state-swap time which is earlier, so
  *                  safe to make decisions on during VBLANK on/off work
@@ -166,7 +165,6 @@ struct dpu_crtc {
        u32 vblank_cb_count;
        u64 play_count;
        ktime_t vblank_cb_time;
-       bool vblank_requested;
        bool enabled;
 
        struct list_head feature_list;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
index 328df37d7580937acf979331cb85bbfe059789e8..c78b521ceda1bd06f7e06635ff86e3eaab483186 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
@@ -728,20 +728,17 @@ TRACE_EVENT(dpu_crtc_vblank_enable,
                __field(        uint32_t,               enc_id  )
                __field(        bool,                   enable  )
                __field(        bool,                   enabled )
-               __field(        bool,                   vblank_requested )
        ),
        TP_fast_assign(
                __entry->drm_id = drm_id;
                __entry->enc_id = enc_id;
                __entry->enable = enable;
                __entry->enabled = crtc->enabled;
-               __entry->vblank_requested = crtc->vblank_requested;
        ),
-       TP_printk("id:%u encoder:%u enable:%s state{enabled:%s vblank_req:%s}",
+       TP_printk("id:%u encoder:%u enable:%s state{enabled:%s}",
                  __entry->drm_id, __entry->enc_id,
                  __entry->enable ? "true" : "false",
-                 __entry->enabled ? "true" : "false",
-                 __entry->vblank_requested ? "true" : "false")
+                 __entry->enabled ? "true" : "false")
 );
 
 DECLARE_EVENT_CLASS(dpu_crtc_enable_template,
@@ -751,18 +748,15 @@ DECLARE_EVENT_CLASS(dpu_crtc_enable_template,
                __field(        uint32_t,               drm_id  )
                __field(        bool,                   enable  )
                __field(        bool,                   enabled )
-               __field(        bool,                   vblank_requested )
        ),
        TP_fast_assign(
                __entry->drm_id = drm_id;
                __entry->enable = enable;
                __entry->enabled = crtc->enabled;
-               __entry->vblank_requested = crtc->vblank_requested;
        ),
-       TP_printk("id:%u enable:%s state{enabled:%s vblank_req:%s}",
+       TP_printk("id:%u enable:%s state{enabled:%s}",
                  __entry->drm_id, __entry->enable ? "true" : "false",
-                 __entry->enabled ? "true" : "false",
-                 __entry->vblank_requested ? "true" : "false")
+                 __entry->enabled ? "true" : "false")
 );
 DEFINE_EVENT(dpu_crtc_enable_template, dpu_crtc_enable,
        TP_PROTO(uint32_t drm_id, bool enable, struct dpu_crtc *crtc),