[PATCH 7/8] drm/msm: dpu: Remove vblank_requested flag from dpu_crtc

[Sean Paul]

On Tue, Nov 13, 2018 at 04:47:34PM -0800, Jeykumar Sankaran wrote:
> On 2018-11-13 12:52, Sean Paul wrote:
> > From: Sean Paul <seanpaul at chromium.org>
> > 
> > It's just for debug output, we don't need it
> > 
> > Signed-off-by: Sean Paul <seanpaul at chromium.org>
> > ---
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  |  6 ------
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h  |  2 --
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 14 ++++----------
> >  3 files changed, 4 insertions(+), 18 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > index 59e823281fdf..ab96a2e69efa 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > @@ -1163,10 +1163,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;
> >  }
> > 
> > @@ -1282,8 +1278,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);
> > 
> 
> I see few more references @ https://gitlab.freedesktop.org/seanpaul/dpu-staging/blob/for-next/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c#L900
> 
> Which change is removing them?

Patch 6

> 
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
> > index 54595cc29be5..2b358546af49 100644
> > --- 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 328df37d7580..c78b521ceda1 100644
> > --- 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),
> 
> -- 
> Jeykumar S

-- 
Sean Paul, Software Engineer, Google / Chromium OS