drm/omap: Fix drm_handle_vblank() handling for command mode panels
Subsystems (3)
PATCH v2 1/1 drm/omap: Fix drm_handle_vblank() handling for command mode panels
When trying to run weston on droid4 with the updated sgx blobs, the LCD is just black and not updating. Weston also displays the following on startup:
Warning: computed repaint delay is insane: -205475 msec
Weston runs fine on the HDMI alone though, and the issue was narrowed down to an issue with vblank as suggested by ruleh <[email protected]>.
Turns out that for command mode displays, we're not currently calling drm_handle_vblank() at all since omap_irq_handler() won't do it for us since we get no vblank interrupts. Let's fix the issue by calling drm_handle_vblank() and omap_crtc_vblank_irq() for command mode displays from omap_crtc_framedone_irq() and make the vblank handling the same for command mode panels as it is for normal displays.
For reference, below is my current weston.ini. The repaint-window is maxed out to force immediate repaint instead of the default 7 ms. Otherwise it seems that the repaint is happening at about 60 fps with es2gears_wayland compared to about 130 fps where it seems to max out.
[core]
xwayland=true
backend=drm-backend.so
repaint-window=1000
pageflip-timeout=1000
[libinput]
rotation=0
[output]
name=DSI-1
transform=90
[output]
name=HDMI-1
mode=1024x768@60
--- drivers/gpu/drm/omapdrm/omap_crtc.c | 41 +++++++++++------------------ drivers/gpu/drm/omapdrm/omap_crtc.h | 2 +- drivers/gpu/drm/omapdrm/omap_irq.c | 2 +- 3 files changed, 18 insertions(+), 27 deletions(-)
drivers/gpu/drm/omapdrm/omap_crtc.c +16 -25
@@ -325,23 +325,21 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc)DBG ("%s: apply done" , omap_crtc->name); } -void omap_crtc_framedone_irq (struct drm_crtc *crtc,uint32_t irqstatus) +void omap_crtc_framedone_irq (struct drm_crtc *crtc,int id,uint32_t irqstatus) { +struct omap_crtc_state *omap_state =to_omap_crtc_state (crtc->state);struct omap_crtc *omap_crtc =to_omap_crtc (crtc); +struct drm_device *dev = crtc->dev;if (!omap_crtc->framedone_handler)return ; - omap_crtc->framedone_handler (omap_crtc->framedone_handler_data); - -spin_lock (&crtc->dev->event_lock); -/* Send the vblank event if one has been requested. */ -if (omap_crtc->event) { -drm_crtc_send_vblank_event (crtc, omap_crtc->event); - omap_crtc->event =NULL ; +if (omap_state->manually_updated) { +drm_handle_vblank (dev, id); +omap_crtc_vblank_irq (crtc); } - omap_crtc->pending = false; -spin_unlock (&crtc->dev->event_lock); + + omap_crtc->framedone_handler (omap_crtc->framedone_handler_data);/* Wake up omap_atomic_complete. */ wake_up (&omap_crtc->pending_wait);
@@ -439,8 +437,12 @@ static void omap_crtc_destroy(struct drm_crtc *crtc)static void omap_crtc_arm_event (struct drm_crtc *crtc) { +struct omap_crtc_state *omap_crtc_state =to_omap_crtc_state (crtc->state);struct omap_crtc *omap_crtc =to_omap_crtc (crtc); +if (omap_crtc->pending && omap_crtc_state->manually_updated) +return ; +WARN_ON (omap_crtc->pending); omap_crtc->pending = true;
@@ -455,17 +457,12 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc, {struct omap_drm_private *priv = crtc->dev->dev_private;struct omap_crtc *omap_crtc =to_omap_crtc (crtc); -struct omap_crtc_state *omap_state =to_omap_crtc_state (crtc->state);int ret;DBG ("%s" , omap_crtc->name); priv->dispc_ops->runtime_get (priv->dispc); -/* manual updated display will not trigger vsync irq */ -if (omap_state->manually_updated) -return ; -spin_lock_irq (&crtc->dev->event_lock);drm_crtc_vblank_on (crtc); ret =drm_crtc_vblank_get (crtc);
@@ -646,20 +643,14 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,DBG ("%s: GO" , omap_crtc->name); -if (omap_crtc_state->manually_updated) { -/* send new image for page flips and modeset changes */ -spin_lock_irq (&crtc->dev->event_lock); -omap_crtc_flush (crtc); -omap_crtc_arm_event (crtc); -spin_unlock_irq (&crtc->dev->event_lock); -return ; - } - ret =drm_crtc_vblank_get (crtc);WARN_ON (ret !=0 );spin_lock_irq (&crtc->dev->event_lock); - priv->dispc_ops->mgr_go (priv->dispc, omap_crtc->channel); +if (omap_crtc_state->manually_updated) +omap_crtc_flush (crtc); +else + priv->dispc_ops->mgr_go (priv->dispc, omap_crtc->channel);omap_crtc_arm_event (crtc);spin_unlock_irq (&crtc->dev->event_lock); }
drivers/gpu/drm/omapdrm/omap_crtc.h +1 -1
@@ -30,7 +30,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,int omap_crtc_wait_pending (struct drm_crtc *crtc);void omap_crtc_error_irq (struct drm_crtc *crtc,u32 irqstatus);void omap_crtc_vblank_irq (struct drm_crtc *crtc); -void omap_crtc_framedone_irq (struct drm_crtc *crtc,uint32_t irqstatus); +void omap_crtc_framedone_irq (struct drm_crtc *crtc,int id,uint32_t irqstatus);void omap_crtc_flush (struct drm_crtc *crtc);#endif /* __OMAPDRM_CRTC_H__ */
drivers/gpu/drm/omapdrm/omap_irq.c +1 -1
@@ -232,7 +232,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)omap_crtc_error_irq (crtc, irqstatus);if (irqstatus & priv->dispc_ops->mgr_get_framedone_irq (priv->dispc, channel)) -omap_crtc_framedone_irq (crtc, irqstatus); +omap_crtc_framedone_irq (crtc, id, irqstatus); }omap_irq_ocp_error_handler (dev, irqstatus);
Signature · 1 line
2.25.1
Hi Tony,
Thank you for the patch.
Quoted 9 lines · Tony Lindgren
When trying to run weston on droid4 with the updated sgx blobs, the LCD is just black and not updating. Weston also displays the following on startup:
Warning: computed repaint delay is insane: -205475 msec
Weston runs fine on the HDMI alone though, and the issue was narrowed down to an issue with vblank as suggested by ruleh <[email protected]>.
Quoted 6 lines
Turns out that for command mode displays, we're not currently calling
drm_handle_vblank()at all sinceomap_irq_handler()won't do it for us since we get no vblank interrupts. Let's fix the issue by callingdrm_handle_vblank()andomap_crtc_vblank_irq()for command mode displays fromomap_crtc_framedone_irq()and make the vblank handling the same for command mode panels as it is for normal displays.
vblank handling is tricky and race-prone. This patch needs very careful attention. I'll try to get a look at it next week if Tomi doesn't beat me to it. Sorry for the delay.
Quoted 149 lines
For reference, below is my current weston.ini. The repaint-window is maxed out to force immediate repaint instead of the default 7 ms. Otherwise it seems that the repaint is happening at about 60 fps with
es2gears_waylandcompared to about 130 fps where it seems to max out.[core]
xwayland=true
backend=drm-backend.so
repaint-window=1000
pageflip-timeout=1000[libinput]
rotation=0[output]
name=DSI-1
transform=90[output]
name=HDMI-1
mode=1024x768@60Fixes 47103a80f55a ("drm/omap: add framedone interrupt support")Cc Ivaylo Dimitrov <[email protected]>Cc Merlijn Wajer <[email protected]>Cc Sebastian Reichel <[email protected]>Cc ruleh <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- drivers/gpu/drm/omapdrm/omap_crtc.c | 41 +++++++++++------------------ drivers/gpu/drm/omapdrm/omap_crtc.h | 2 +- drivers/gpu/drm/omapdrm/omap_irq.c | 2 +- 3 files changed, 18 insertions(+), 27 deletions(-)drivers/gpu/drm/omapdrm/omap_crtc.c +16
-25@@ -325,23 +325,21 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc)DBG ("%s: apply done" , omap_crtc->name); } -void omap_crtc_framedone_irq (struct drm_crtc *crtc,uint32_t irqstatus) +void omap_crtc_framedone_irq (struct drm_crtc *crtc,int id,uint32_t irqstatus) { +struct omap_crtc_state *omap_state =to_omap_crtc_state (crtc->state);struct omap_crtc *omap_crtc =to_omap_crtc (crtc); +struct drm_device *dev = crtc->dev;if (!omap_crtc->framedone_handler)return ; - omap_crtc->framedone_handler (omap_crtc->framedone_handler_data); - -spin_lock (&crtc->dev->event_lock); -/* Send the vblank event if one has been requested. */ -if (omap_crtc->event) { -drm_crtc_send_vblank_event (crtc, omap_crtc->event); - omap_crtc->event =NULL ; +if (omap_state->manually_updated) { +drm_handle_vblank (dev, id); +omap_crtc_vblank_irq (crtc); } - omap_crtc->pending = false; -spin_unlock (&crtc->dev->event_lock); + + omap_crtc->framedone_handler (omap_crtc->framedone_handler_data);/* Wake up omap_atomic_complete. */ wake_up (&omap_crtc->pending_wait);@@ -439,8 +437,12 @@ static void omap_crtc_destroy(struct drm_crtc *crtc)static void omap_crtc_arm_event (struct drm_crtc *crtc) { +struct omap_crtc_state *omap_crtc_state =to_omap_crtc_state (crtc->state);struct omap_crtc *omap_crtc =to_omap_crtc (crtc); +if (omap_crtc->pending && omap_crtc_state->manually_updated) +return ; +WARN_ON (omap_crtc->pending); omap_crtc->pending = true;@@ -455,17 +457,12 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc, {struct omap_drm_private *priv = crtc->dev->dev_private;struct omap_crtc *omap_crtc =to_omap_crtc (crtc); -struct omap_crtc_state *omap_state =to_omap_crtc_state (crtc->state);int ret;DBG ("%s" , omap_crtc->name); priv->dispc_ops->runtime_get (priv->dispc); -/* manual updated display will not trigger vsync irq */ -if (omap_state->manually_updated) -return ; -spin_lock_irq (&crtc->dev->event_lock);drm_crtc_vblank_on (crtc); ret =drm_crtc_vblank_get (crtc);@@ -646,20 +643,14 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,DBG ("%s: GO" , omap_crtc->name); -if (omap_crtc_state->manually_updated) { -/* send new image for page flips and modeset changes */ -spin_lock_irq (&crtc->dev->event_lock); -omap_crtc_flush (crtc); -omap_crtc_arm_event (crtc); -spin_unlock_irq (&crtc->dev->event_lock); -return ; - } - ret =drm_crtc_vblank_get (crtc);WARN_ON (ret !=0 );spin_lock_irq (&crtc->dev->event_lock); - priv->dispc_ops->mgr_go (priv->dispc, omap_crtc->channel); +if (omap_crtc_state->manually_updated) +omap_crtc_flush (crtc); +else + priv->dispc_ops->mgr_go (priv->dispc, omap_crtc->channel);omap_crtc_arm_event (crtc);spin_unlock_irq (&crtc->dev->event_lock); }drivers/gpu/drm/omapdrm/omap_crtc.h +1
-1@@ -30,7 +30,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,int omap_crtc_wait_pending (struct drm_crtc *crtc);void omap_crtc_error_irq (struct drm_crtc *crtc,u32 irqstatus);void omap_crtc_vblank_irq (struct drm_crtc *crtc); -void omap_crtc_framedone_irq (struct drm_crtc *crtc,uint32_t irqstatus); +void omap_crtc_framedone_irq (struct drm_crtc *crtc,int id,uint32_t irqstatus);void omap_crtc_flush (struct drm_crtc *crtc);#endif /* __OMAPDRM_CRTC_H__ */ drivers/gpu/drm/omapdrm/omap_irq.c +1
-1@@ -232,7 +232,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)omap_crtc_error_irq (crtc, irqstatus);if (irqstatus & priv->dispc_ops->mgr_get_framedone_irq (priv->dispc, channel)) -omap_crtc_framedone_irq (crtc, irqstatus); +omap_crtc_framedone_irq (crtc, id, irqstatus); }omap_irq_ocp_error_handler (dev, irqstatus);
Signature · 3 lines
Regards, Laurent Pinchart