From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752900AbdDLJxX (ORCPT ); Wed, 12 Apr 2017 05:53:23 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:47685 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbdDLJxV (ORCPT ); Wed, 12 Apr 2017 05:53:21 -0400 Message-ID: <1491990790.2270.56.camel@pengutronix.de> Subject: Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() From: Lucas Stach To: Wei Yongjun Cc: Russell King , Christian Gmeiner , David Airlie , Wei Yongjun , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Wed, 12 Apr 2017 11:53:10 +0200 In-Reply-To: <20170412003116.30767-1-weiyj.lk@gmail.com> References: <20170412003116.30767-1-weiyj.lk@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:fa0f:41ff:fe58:4010 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Mittwoch, den 12.04.2017, 00:31 +0000 schrieb Wei Yongjun: > From: Wei Yongjun > > Add the missing unlock before return from function etnaviv_gpu_submit() > in the error handling case. > > Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with > GPU mutex") > Signed-off-by: Wei Yongjun > --- > drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c > index da48819..e4a4d4c 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c > @@ -1317,7 +1317,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, > if (!fence) { > event_free(gpu, event); > ret = -ENOMEM; > - goto out_pm_put; > + goto out_unlok; Label should probably be named "out_unlock". Fixed up while applying, thanks. Regards, Lucas > } > > gpu->event[event].fence = fence; > @@ -1357,6 +1357,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, > hangcheck_timer_reset(gpu); > ret = 0; > > +out_unlok: > mutex_unlock(&gpu->lock); > > out_pm_put: > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() Date: Wed, 12 Apr 2017 11:53:10 +0200 Message-ID: <1491990790.2270.56.camel@pengutronix.de> References: <20170412003116.30767-1-weiyj.lk@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0FA16E202 for ; Wed, 12 Apr 2017 09:53:19 +0000 (UTC) In-Reply-To: <20170412003116.30767-1-weiyj.lk@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Wei Yongjun Cc: etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Wei Yongjun , Russell King List-Id: dri-devel@lists.freedesktop.org QW0gTWl0dHdvY2gsIGRlbiAxMi4wNC4yMDE3LCAwMDozMSArMDAwMCBzY2hyaWViIFdlaSBZb25n anVuOgo+IEZyb206IFdlaSBZb25nanVuIDx3ZWl5b25nanVuMUBodWF3ZWkuY29tPgo+IAo+IEFk ZCB0aGUgbWlzc2luZyB1bmxvY2sgYmVmb3JlIHJldHVybiBmcm9tIGZ1bmN0aW9uIGV0bmF2aXZf Z3B1X3N1Ym1pdCgpCj4gaW4gdGhlIGVycm9yIGhhbmRsaW5nIGNhc2UuCj4gCj4gRml4ZXM6IGYz Y2QxYjA2NGYxMSAoImRybS9ldG5hdml2OiAocmUtKXByb3RlY3QgZmVuY2UgYWxsb2NhdGlvbiB3 aXRoCj4gR1BVIG11dGV4IikKPiBTaWduZWQtb2ZmLWJ5OiBXZWkgWW9uZ2p1biA8d2VpeW9uZ2p1 bjFAaHVhd2VpLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9n cHUuYyB8IDMgKystCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9n cHUuYyBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ3B1LmMKPiBpbmRleCBkYTQ4 ODE5Li5lNGE0ZDRjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2 aXZfZ3B1LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dwdS5jCj4g QEAgLTEzMTcsNyArMTMxNyw3IEBAIGludCBldG5hdml2X2dwdV9zdWJtaXQoc3RydWN0IGV0bmF2 aXZfZ3B1ICpncHUsCj4gIAlpZiAoIWZlbmNlKSB7Cj4gIAkJZXZlbnRfZnJlZShncHUsIGV2ZW50 KTsKPiAgCQlyZXQgPSAtRU5PTUVNOwo+IC0JCWdvdG8gb3V0X3BtX3B1dDsKPiArCQlnb3RvIG91 dF91bmxvazsKCkxhYmVsIHNob3VsZCBwcm9iYWJseSBiZSBuYW1lZCAib3V0X3VubG9jayIuIEZp eGVkIHVwIHdoaWxlIGFwcGx5aW5nLAp0aGFua3MuCgpSZWdhcmRzLApMdWNhcwoKPiAgCX0KPiAg Cj4gIAlncHUtPmV2ZW50W2V2ZW50XS5mZW5jZSA9IGZlbmNlOwo+IEBAIC0xMzU3LDYgKzEzNTcs NyBAQCBpbnQgZXRuYXZpdl9ncHVfc3VibWl0KHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1LAo+ICAJ aGFuZ2NoZWNrX3RpbWVyX3Jlc2V0KGdwdSk7Cj4gIAlyZXQgPSAwOwo+ICAKPiArb3V0X3VubG9r Ogo+ICAJbXV0ZXhfdW5sb2NrKCZncHUtPmxvY2spOwo+ICAKPiAgb3V0X3BtX3B1dDoKPiAKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK