Commit 3e46c5df authored by Sean Paul's avatar Sean Paul Committed by Rob Clark
Browse files

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: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent a796ba2c

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h

+4 −10
Original line number Diff line number Diff line
@@ -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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE