On 11/01/16 23:41, Daniel Vetter wrote:
Again since the drm core takes care of event unlinking/disarming this is now just needless code.
v2: Fixup misplaced hunks.
Cc: Rob Clark robdclark@gmail.com Acked-by: Daniel Stone daniels@collabora.com Reviewed-by: Alex Deucher alexander.deucher@amd.com (v1) Signed-off-by: Daniel Vetter daniel.vetter@intel.com
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 -------------------- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 -------- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 - 3 files changed, 29 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 7d07733bdc86..4802da8e6d6f 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -662,26 +662,6 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) return IRQ_HANDLED; }
-void tilcdc_crtc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file) -{
- struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
- struct drm_pending_vblank_event *event;
- struct drm_device *dev = crtc->dev;
- unsigned long flags;
- /* Destroy the pending vertical blanking event associated with the
* pending page flip, if any, and disable vertical blanking interrupts.*/- spin_lock_irqsave(&dev->event_lock, flags);
- event = tilcdc_crtc->event;
- if (event && event->base.file_priv == file) {
tilcdc_crtc->event = NULL;event->base.destroy(&event->base);drm_vblank_put(dev, 0);- }
- spin_unlock_irqrestore(&dev->event_lock, flags);
-}
Hmm, looks fine, but when I was comparing the omapdrm change and this one, I see tilcdc doing drm_vblank_put() in the removed code but omapdrm doesn't.
The other patches that nuke preclose hooks also contain vblank_put. Will there be a vblank_put call missing here, or will there be an extra vblank_put call happening somewhere on omapdrm?
Tomi