diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-31 18:21:13 +0200 |
|---|---|---|
| committer | Liviu Dudau <Liviu.Dudau@arm.com> | 2016-06-02 17:44:05 +0100 |
| commit | 38c8c22c12e99b70fc59ea7ef4d0bb24c11e5ddd (patch) | |
| tree | 6a739e94f0bbc1345acdef66852dea959961d8c8 /drivers/gpu/drm/arm/hdlcd_crtc.c | |
| parent | a95acec16d932ac78c2f70dc95a83bd162595d6c (diff) | |
| download | linux-38c8c22c12e99b70fc59ea7ef4d0bb24c11e5ddd.tar.gz linux-38c8c22c12e99b70fc59ea7ef4d0bb24c11e5ddd.tar.bz2 linux-38c8c22c12e99b70fc59ea7ef4d0bb24c11e5ddd.zip | |
drm/hdlcd: Fix up crtc_state->event handling
event_list just reimplemented what drm_crtc_arm_vblank_event does. And
we also need to send out drm events when shutting down a pipe.
With this it's possible to use the new nonblocking commit support in
the helpers.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Diffstat (limited to 'drivers/gpu/drm/arm/hdlcd_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_crtc.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index d1e8d31e37ee..97326c3d7a3a 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -189,19 +189,17 @@ static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *state) { struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); - unsigned long flags; - - if (crtc->state->event) { - struct drm_pending_vblank_event *event = crtc->state->event; + struct drm_pending_vblank_event *event = crtc->state->event; + if (event) { crtc->state->event = NULL; - event->pipe = drm_crtc_index(crtc); - - WARN_ON(drm_crtc_vblank_get(crtc) != 0); - spin_lock_irqsave(&crtc->dev->event_lock, flags); - list_add_tail(&event->base.link, &hdlcd->event_list); - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + spin_lock_irq(&crtc->dev->event_lock); + if (drm_crtc_vblank_get(crtc) == 0) + drm_crtc_arm_vblank_event(crtc, event); + else + drm_crtc_send_vblank_event(crtc, event); + spin_unlock_irq(&crtc->dev->event_lock); } } |