From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v5 2/4] drm/fence: release fence reference when canceling event Date: Fri, 21 Oct 2016 14:52:37 +0200 Message-ID: <20161021125237.GD20761@phenom.ffwll.local> References: <1476975005-30441-1-git-send-email-gustavo@padovan.org> <1476975005-30441-3-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 678FD6ED02 for ; Fri, 21 Oct 2016 12:52:42 +0000 (UTC) Received: by mail-qk0-x241.google.com with SMTP id v138so7051888qka.2 for ; Fri, 21 Oct 2016 05:52:42 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1476975005-30441-3-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, m.chehab@samsung.com, Gustavo Padovan , John Harrison , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMjAsIDIwMTYgYXQgMTI6NTA6MDNQTSAtMDIwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+IEZyb206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KPiAKPiBJZiB0aGUgZXZlbnQgZ2V0cyBjYW5jZWxlZCB3ZSBhbHNvIG5lZWQgdG8g cHV0IGF3YXkgdGhlIGZlbmNlCj4gcmVmZXJlbmNlIGl0IGhvbGRzLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KClJl dmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgoKSSd2ZSBi cm9rZW4gbXkgbG9jYWwgZGltIHNjcmlwdHMgcmlnaHQgbm93LCBzbyBjYW4ndCBhcHBseSA7LSkK LURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9mb3BzLmMgfCA0ICsrKysKPiAg MSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2ZvcHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCj4gaW5kZXgg ZTg0ZmFlYy4uOGJlZDVmNCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCj4gQEAgLTY2Myw2ICs2NjMsMTAg QEAgdm9pZCBkcm1fZXZlbnRfY2FuY2VsX2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAg CQlsaXN0X2RlbCgmcC0+cGVuZGluZ19saW5rKTsKPiAgCX0KPiAgCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwo+ICsKPiArCWlmIChwLT5mZW5jZSkKPiAr CQlmZW5jZV9wdXQocC0+ZmVuY2UpOwo+ICsKPiAgCWtmcmVlKHApOwo+ICB9Cj4gIEVYUE9SVF9T WU1CT0woZHJtX2V2ZW50X2NhbmNlbF9mcmVlKTsKPiAtLSAKPiAyLjUuNQo+IAoKLS0gCkRhbmll bCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9n LmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933597AbcJUMws (ORCPT ); Fri, 21 Oct 2016 08:52:48 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:34575 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932247AbcJUMwm (ORCPT ); Fri, 21 Oct 2016 08:52:42 -0400 Date: Fri, 21 Oct 2016 14:52:37 +0200 From: Daniel Vetter To: Gustavo Padovan Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Sumit Semwal , Maarten Lankhorst , Gustavo Padovan Subject: Re: [PATCH v5 2/4] drm/fence: release fence reference when canceling event Message-ID: <20161021125237.GD20761@phenom.ffwll.local> Mail-Followup-To: Gustavo Padovan , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Sumit Semwal , Maarten Lankhorst , Gustavo Padovan References: <1476975005-30441-1-git-send-email-gustavo@padovan.org> <1476975005-30441-3-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1476975005-30441-3-git-send-email-gustavo@padovan.org> X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 20, 2016 at 12:50:03PM -0200, Gustavo Padovan wrote: > From: Gustavo Padovan > > If the event gets canceled we also need to put away the fence > reference it holds. > > Signed-off-by: Gustavo Padovan Reviewed-by: Daniel Vetter 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 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch