drm/msm: Customize wait for atomic commit done function
cover drm/msm: Customize wait for atomic commit done function
The current way to wait for atomic commit done may cause unnecessary wait for another vsync for video mode path. Also, for command mode path, we need to wait for PP_DONE event other than vsync before finish. This patch series is to fix these issues.
Hai Li (2):
drm/msm: Use customized function to wait for atomic commit done drm/msm/mdp5: Wait for PP_DONE irq for command mode CRTC atomic commit
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 46 +++++++++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 7 ++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 4 - drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 127 +++++++++++++++++++++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 11 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 3 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 ++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + drivers/gpu/drm/msm/msm_atomic.c | 30 +++++- drivers/gpu/drm/msm/msm_kms.h | 3 + 11 files changed, 215 insertions(+), 25 deletions(-)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/2 drm/msm: Use customized function to wait for atomic commit done
MDP FLUSH registers could indicate if the previous flush updates has taken effect at vsync boundary. Making use of this H/W feature can catch the vsync that happened between CRTC atomic_flush and *_wait_for_vblanks, to avoid unnecessary wait.
This change allows kms CRTCs to use their own *_wait_for_commit_done functions to wait for FLUSH register cleared at vsync, before commit completion.
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 46 ++++++++++++++++++++++++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 7 ++++ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 62 ++++++++++++++++++++++++++++---- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 11 ++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 3 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 ++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + drivers/gpu/drm/msm/msm_atomic.c | 30 ++++++++++++++-- drivers/gpu/drm/msm/msm_kms.h | 3 ++ 10 files changed, 160 insertions(+), 11 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +46 -0
@@ -51,6 +51,11 @@ struct mdp4_crtc {/* if there is a pending flip, these will be non-null: */ struct drm_pending_vblank_event *event; +/* Bits have been flushed at the last commit, +* used to decide if a vsync has happened since last commit. +*/ +u32 flushed_mask; +#define PENDING_CURSOR 0x1#define PENDING_FLIP 0x2atomic_t pending;
@@ -60,6 +65,8 @@ struct mdp4_crtc {struct mdp_irq vblank;struct mdp_irq err; + +void (*wait_for_commit_done)(struct drm_crtc *crtc); };#define to_mdp4_crtc (x) container_of(x, struct mdp4_crtc, base)
@@ -93,6 +100,8 @@ static void crtc_flush(struct drm_crtc *crtc)DBG ("%s: flush=%08x" , mdp4_crtc->name, flush); + mdp4_crtc->flushed_mask = flush; +mdp4_write (mdp4_kms,REG_MDP4_OVERLAY_FLUSH , flush); }
@@ -537,6 +546,29 @@ static void mdp4_crtc_err_irq(struct mdp_irq *irq, uint32_t irqstatus)crtc_flush (crtc); } +static void mdp4_crtc_wait_for_flush_done (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc); +struct mdp4_kms *mdp4_kms =get_kms (crtc); +int ret; + + ret =drm_crtc_vblank_get (crtc); +if (ret) +return ; + + ret =wait_event_timeout (dev->vblank[drm_crtc_index (crtc)].queue, + !(mdp4_read (mdp4_kms,REG_MDP4_OVERLAY_FLUSH ) & + mdp4_crtc->flushed_mask), +msecs_to_jiffies (50 )); +if (ret <=0 ) +dev_warn (dev->dev,"vblank time out, crtc=%d\n" , mdp4_crtc->id); + + mdp4_crtc->flushed_mask =0 ; + +drm_crtc_vblank_put (crtc); +} +uint32_t mdp4_crtc_vblank (struct drm_crtc *crtc) {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);
@@ -566,6 +598,8 @@ void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer)struct mdp4_kms *mdp4_kms =get_kms (crtc);uint32_t intf_sel; + mdp4_crtc->wait_for_commit_done = mdp4_crtc_wait_for_flush_done; + intf_sel =mdp4_read (mdp4_kms,REG_MDP4_DISP_INTF_SEL );switch (mdp4_crtc->dma) {
@@ -600,6 +634,18 @@ void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer)mdp4_write (mdp4_kms,REG_MDP4_DISP_INTF_SEL , intf_sel); } +void mdp4_crtc_wait_for_commit_done (struct drm_crtc *crtc) +{ +struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc); +struct drm_device *dev = crtc->dev; + +if (mdp4_crtc->wait_for_commit_done) + mdp4_crtc->wait_for_commit_done (crtc); +else +dev_warn (dev->dev,"no wait_for_commit_done func, crtc=%d\n" , + mdp4_crtc->id); +} +static const char *dma_names[] = {"DMA_P" ,"DMA_S" ,"DMA_E" , };
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +7 -0
@@ -157,6 +157,12 @@ static void mdp4_complete_commit(struct msm_kms *kms, struct drm_atomic_state *smdp4_disable (mdp4_kms); } +static void mdp4_wait_for_crtc_commit_done (struct msm_kms *kms, +struct drm_crtc *crtc) +{ +mdp4_crtc_wait_for_commit_done (crtc); +} +static long mdp4_round_pixclk (struct msm_kms *kms,unsigned long rate,struct drm_encoder *encoder) {
@@ -195,6 +201,7 @@ static const struct mdp_kms_funcs kms_funcs = { .disable_vblank = mdp4_disable_vblank, .prepare_commit = mdp4_prepare_commit, .complete_commit = mdp4_complete_commit, + .wait_for_crtc_commit_done = mdp4_wait_for_crtc_commit_done, .get_format = mdp_get_format, .round_pixclk = mdp4_round_pixclk, .preclose = mdp4_preclose,
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +1 -0
@@ -206,6 +206,7 @@ uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);void mdp4_crtc_cancel_pending_flip (struct drm_crtc *crtc,struct drm_file *file);void mdp4_crtc_set_config (struct drm_crtc *crtc,uint32_t config);void mdp4_crtc_set_intf (struct drm_crtc *crtc,enum mdp4_intf intf,int mixer); +void mdp4_crtc_wait_for_commit_done (struct drm_crtc *crtc);struct drm_crtc *mdp4_crtc_init (struct drm_device *dev,struct drm_plane *plane,int id,int ovlp_id,enum mdp4_dma dma_id);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +56 -6
126 lines not on this page · raw message
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c +9 -2
@@ -403,8 +403,10 @@ static u32 fix_sw_flush(struct mdp5_ctl *ctl, u32 flush_mask)* CTL registers need to be flushed in some circumstances; if that is the * case, some trigger bits will be present in both flush mask and * ctl->pending_ctl_trigger. +* +* Return H/W flushed bit mask. */ -int mdp5_ctl_commit (struct mdp5_ctl *ctl,u32 flush_mask) +u32 mdp5_ctl_commit (struct mdp5_ctl *ctl,u32 flush_mask) {struct mdp5_ctl_manager *ctl_mgr = ctl->ctlm;struct op_mode *pipeline = &ctl->pipeline;
@@ -435,7 +437,12 @@ int mdp5_ctl_commit(struct mdp5_ctl *ctl, u32 flush_mask)refill_start_mask (ctl); } -return 0 ; +return flush_mask; +} + +u32 mdp5_ctl_get_commit_status (struct mdp5_ctl *ctl) +{ +return ctl_read (ctl,REG_MDP5_CTL_FLUSH (ctl->id)); }void mdp5_ctl_release (struct mdp5_ctl *ctl)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h +2 -1
@@ -88,7 +88,8 @@ u32 mdp_ctl_flush_mask_cursor(int cursor_id);u32 mdp_ctl_flush_mask_encoder (struct mdp5_interface *intf);/* @flush_mask: see CTL flush masks definitions below */ -int mdp5_ctl_commit (struct mdp5_ctl *ctl,u32 flush_mask); +u32 mdp5_ctl_commit (struct mdp5_ctl *ctl,u32 flush_mask); +u32 mdp5_ctl_get_commit_status (struct mdp5_ctl *ctl);void mdp5_ctl_release (struct mdp5_ctl *ctl);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +7 -0
@@ -82,6 +82,12 @@ static void mdp5_complete_commit(struct msm_kms *kms, struct drm_atomic_state *smdp5_disable (mdp5_kms); } +static void mdp5_wait_for_crtc_commit_done (struct msm_kms *kms, +struct drm_crtc *crtc) +{ +mdp5_crtc_wait_for_commit_done (crtc); +} +static long mdp5_round_pixclk (struct msm_kms *kms,unsigned long rate,struct drm_encoder *encoder) {
@@ -143,6 +149,7 @@ static const struct mdp_kms_funcs kms_funcs = { .disable_vblank = mdp5_disable_vblank, .prepare_commit = mdp5_prepare_commit, .complete_commit = mdp5_complete_commit, + .wait_for_crtc_commit_done = mdp5_wait_for_crtc_commit_done, .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +1 -0
@@ -237,6 +237,7 @@ int mdp5_crtc_get_lm(struct drm_crtc *crtc);struct mdp5_ctl *mdp5_crtc_get_ctl (struct drm_crtc *crtc);void mdp5_crtc_cancel_pending_flip (struct drm_crtc *crtc,struct drm_file *file);void mdp5_crtc_set_intf (struct drm_crtc *crtc,struct mdp5_interface *intf); +void mdp5_crtc_wait_for_commit_done (struct drm_crtc *crtc);struct drm_crtc *mdp5_crtc_init (struct drm_device *dev,struct drm_plane *plane,int id);
drivers/gpu/drm/msm/msm_atomic.c +28 -2
@@ -84,6 +84,33 @@ static void commit_destroy(struct msm_commit *c)kfree (c); } +static void msm_atomic_wait_for_commit_done (struct drm_device *dev, +struct drm_atomic_state *old_state) +{ +struct drm_crtc *crtc; +struct msm_drm_private *priv = old_state->dev->dev_private; +struct msm_kms *kms = priv->kms; +int ncrtcs = old_state->dev->mode_config.num_crtc; +int i; + +for (i =0 ; i < ncrtcs; i++) { + crtc = old_state->crtcs[i]; + +if (!crtc) +continue ; + +if (!crtc->state->enable) +continue ; + +/* Legacy cursor ioctls are completely unsynced, and userspace +* relies on that (by doing tons of cursor updates). */ +if (old_state->legacy_cursor_update) +continue ; + + kms->funcs->wait_for_crtc_commit_done (kms, crtc); + } +} +/* The (potentially) asynchronous part of the commit. At this point * nothing can fail short of armageddon. */
@@ -115,7 +142,7 @@ static void complete_commit(struct msm_commit *c)* not be critical path) */ -drm_atomic_helper_wait_for_vblanks (dev, state); +msm_atomic_wait_for_commit_done (dev, state);drm_atomic_helper_cleanup_planes (dev, state);
@@ -139,7 +166,6 @@ static void add_fb(struct msm_commit *c, struct drm_framebuffer *fb) c->fence =max (c->fence,msm_gem_fence (to_msm_bo (obj),MSM_PREP_READ )); } -int msm_atomic_check (struct drm_device *dev,struct drm_atomic_state *state) {
drivers/gpu/drm/msm/msm_kms.h +3 -0
@@ -43,6 +43,9 @@ struct msm_kms_funcs {/* modeset, bracketing atomic_commit(): */ void (*prepare_commit)(struct msm_kms *kms,struct drm_atomic_state *state);void (*complete_commit)(struct msm_kms *kms,struct drm_atomic_state *state); +/* functions to wait for atomic commit completed on each CRTC */ +void (*wait_for_crtc_commit_done)(struct msm_kms *kms, +struct drm_crtc *crtc);/* misc: */ const struct msm_format *(*get_format)(struct msm_kms *kms,uint32_t format); long (*round_pixclk)(struct msm_kms *kms, unsigned long rate,
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/msm/mdp5: Wait for PP_DONE irq for command mode CRTC atomic commit
In reply to Hai LiCRTCs in DSI command mode data path should wait for pingpong done, instead of vblank, to finish atomic commit.
This change is to enable PP_DONE irq on command mode CRTCs and wait for this irq happens before atomic commit completion.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 4 -- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 71 ++++++++++++++++++++----- 2 files changed, 58 insertions(+), 17 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c +0 -4
@@ -216,16 +216,12 @@ static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder,static void mdp5_cmd_encoder_disable (struct drm_encoder *encoder) {struct mdp5_cmd_encoder *mdp5_cmd_enc =to_mdp5_cmd_encoder (encoder); -struct mdp5_kms *mdp5_kms =get_kms (encoder);struct mdp5_ctl *ctl =mdp5_crtc_get_ctl (encoder->crtc);struct mdp5_interface *intf = &mdp5_cmd_enc->intf; -int lm =mdp5_crtc_get_lm (encoder->crtc);if (WARN_ON (!mdp5_cmd_enc->enabled))return ; -/* Wait for the last frame done */ -mdp_irq_wait (&mdp5_kms->base,lm2ppdone (lm));pingpong_tearcheck_disable (encoder);mdp5_ctl_set_encoder_state (ctl, false);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +58 -13
123 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel