Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754683AbcK1M7L (ORCPT ); Mon, 28 Nov 2016 07:59:11 -0500 Received: from pegasos-out.vodafone.de ([80.84.1.38]:39500 "EHLO pegasos-out.vodafone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753790AbcK1M7H (ORCPT ); Mon, 28 Nov 2016 07:59:07 -0500 X-Spam-Flag: NO X-Spam-Score: 0.2 Authentication-Results: rohrpostix2.prod.vfnet.de (amavisd-new); dkim=pass header.i=@vodafone.de X-DKIM: OpenDKIM Filter v2.6.8 pegasos-out.vodafone.de 2D32E606A77 Subject: Re: [PATCH 01/11] drm/vgem: Use ww_mutex_(un)lock even with a NULL context To: =?UTF-8?Q?Nicolai_H=c3=a4hnle?= , linux-kernel@vger.kernel.org References: <1480335612-12069-1-git-send-email-nhaehnle@gmail.com> <1480335612-12069-2-git-send-email-nhaehnle@gmail.com> Cc: Maarten Lankhorst , =?UTF-8?Q?Nicolai_H=c3=a4hnle?= , Peter Zijlstra , dri-devel@lists.freedesktop.org, Ingo Molnar From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: Date: Mon, 28 Nov 2016 13:58:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1480335612-12069-2-git-send-email-nhaehnle@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1422 Lines: 40 Am 28.11.2016 um 13:20 schrieb Nicolai Hähnle: > From: Nicolai Hähnle > > Cc: Peter Zijlstra > Cc: Ingo Molnar > Cc: Maarten Lankhorst > Cc: Daniel Vetter > Cc: Chris Wilson > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Nicolai Hähnle > --- > drivers/gpu/drm/vgem/vgem_fence.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c > index 488909a..e1d516f 100644 > --- a/drivers/gpu/drm/vgem/vgem_fence.c > +++ b/drivers/gpu/drm/vgem/vgem_fence.c > @@ -191,12 +191,12 @@ int vgem_fence_attach_ioctl(struct drm_device *dev, > > /* Expose the fence via the dma-buf */ > ret = 0; > - mutex_lock(&resv->lock.base); > + ww_mutex_lock(&resv->lock.base, NULL); Accessing the base member here is probably superfluous now and will most likely raise a warning. Christian. > if (arg->flags & VGEM_FENCE_WRITE) > reservation_object_add_excl_fence(resv, fence); > else if ((ret = reservation_object_reserve_shared(resv)) == 0) > reservation_object_add_shared_fence(resv, fence); > - mutex_unlock(&resv->lock.base); > + ww_mutex_unlock(&resv->lock.base); > > /* Record the fence in our idr for later signaling */ > if (ret == 0) {