| Message ID | 1476975005-30441-3-git-send-email-gustavo@padovan.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 20, 2016 at 12:50:03PM -0200, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > If the event gets canceled we also need to put away the fence > reference it holds. > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> I've broken my local dim scripts right now, so can't apply ;-) -Daniel > --- > drivers/gpu/drm/drm_fops.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c > index e84faec..8bed5f4 100644 > --- a/drivers/gpu/drm/drm_fops.c > +++ b/drivers/gpu/drm/drm_fops.c > @@ -663,6 +663,10 @@ void drm_event_cancel_free(struct drm_device *dev, > list_del(&p->pending_link); > } > spin_unlock_irqrestore(&dev->event_lock, flags); > + > + if (p->fence) > + fence_put(p->fence); > + > kfree(p); > } > EXPORT_SYMBOL(drm_event_cancel_free); > -- > 2.5.5 >
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index e84faec..8bed5f4 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -663,6 +663,10 @@ void drm_event_cancel_free(struct drm_device *dev, list_del(&p->pending_link); } spin_unlock_irqrestore(&dev->event_lock, flags); + + if (p->fence) + fence_put(p->fence); + kfree(p); } EXPORT_SYMBOL(drm_event_cancel_free);