Skip to content

Commit

Permalink
drm/omap: keep ref to old_fb
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomi Valkeinen committed Mar 24, 2015
1 parent 7439507 commit 223bfd6
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/gpu/drm/omapdrm/omap_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,17 +554,23 @@ 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);

/* wakeup userspace */
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)
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 223bfd6

Please sign in to comment.