drm/omap: keep ref to old_fb
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 10 Feb 2015 12:15:52 +0000 (14:15 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 24 Mar 2015 11:50:59 +0000 (13:50 +0200)
We store the fb being page-flipped to 'old_fb' field, but we don't
increase the ref count of the fb when doing that. While I am not
sure if it can cause problem in practice, it's still safer to keep a ref
when storing a pointer to a fb.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/gpu/drm/omapdrm/omap_crtc.c

index 7b93880a4577c46c63b211a2459e6642316e93eb..f456544bf300ba89fdea11242afd4656436888dd 100644 (file)
@@ -554,6 +554,7 @@ static void vblank_cb(void *arg)
        struct drm_device *dev = crtc->dev;
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
        unsigned long flags;
+       struct drm_framebuffer *fb;
 
        spin_lock_irqsave(&dev->event_lock, flags);
 
@@ -561,10 +562,15 @@ static void vblank_cb(void *arg)
        if (omap_crtc->event)
                drm_send_vblank_event(dev, omap_crtc->pipe, omap_crtc->event);
 
+       fb = omap_crtc->old_fb;
+
        omap_crtc->event = NULL;
        omap_crtc->old_fb = NULL;
 
        spin_unlock_irqrestore(&dev->event_lock, flags);
+
+       if (fb)
+               drm_framebuffer_unreference(fb);
 }
 
 static void page_flip_worker(struct work_struct *work)
@@ -620,6 +626,7 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
 
        omap_crtc->event = event;
        omap_crtc->old_fb = primary->fb = fb;
+       drm_framebuffer_reference(omap_crtc->old_fb);
 
        spin_unlock_irqrestore(&dev->event_lock, flags);