From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78BAAC282DD for ; Thu, 23 May 2019 20:52:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A9FC20644 for ; Thu, 23 May 2019 20:52:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="U42BPFA7"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="U42BPFA7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387660AbfEWUwa (ORCPT ); Thu, 23 May 2019 16:52:30 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49742 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387652AbfEWUwa (ORCPT ); Thu, 23 May 2019 16:52:30 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E3EAE60DB6; Thu, 23 May 2019 20:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1558644749; bh=/UkhJ93ZONFLE39bSDbU+e/YiFVV3dmUDhxYaiPXzSw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=U42BPFA7vqS82Nn6/2voaQrRpN79EvQajEnwamQTVvn1WPeHtoaFRNNaeETP5+fEz GHqko3Xb2EbPgmRgLU7p4VD0HpilqYtKzKzt9HVu/brLoQPl3YXhyc0w+CHyVlyVCI OWReVsSzmO+wqtsoAeF1h6edDrG2RCTWJDpSzS7Q= Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id EC2EA60C8B; Thu, 23 May 2019 20:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1558644749; bh=/UkhJ93ZONFLE39bSDbU+e/YiFVV3dmUDhxYaiPXzSw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=U42BPFA7vqS82Nn6/2voaQrRpN79EvQajEnwamQTVvn1WPeHtoaFRNNaeETP5+fEz GHqko3Xb2EbPgmRgLU7p4VD0HpilqYtKzKzt9HVu/brLoQPl3YXhyc0w+CHyVlyVCI OWReVsSzmO+wqtsoAeF1h6edDrG2RCTWJDpSzS7Q= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org EC2EA60C8B Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org Date: Thu, 23 May 2019 14:52:27 -0600 From: Jordan Crouse To: Sean Paul Cc: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Sean Paul , Rob Clark , linux-arm-msm@vger.kernel.org Subject: Re: [PATCH v2 5/6] drm/msm/a6xx: Drop the device reference in gmu Message-ID: <20190523205226.GF18360@jcrouse1-lnx.qualcomm.com> Mail-Followup-To: Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Sean Paul , Rob Clark , linux-arm-msm@vger.kernel.org References: <20190523171653.138678-1-sean@poorly.run> <20190523171653.138678-5-sean@poorly.run> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190523171653.138678-5-sean@poorly.run> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu, May 23, 2019 at 01:16:44PM -0400, Sean Paul wrote: > From: Sean Paul > > of_find_device_by_node() grabs a dev reference, so make sure we clear it > on error and remove. > > Changes in v2: > - Added to the set (Jordan) > > Cc: Jordan Crouse > Signed-off-by: Sean Paul Reviewed-by: Jordan Crouse > --- > drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > index f7240c9e11fb..e2b839b5d3bd 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > @@ -1253,6 +1253,9 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) > free_irq(gmu->gmu_irq, gmu); > free_irq(gmu->hfi_irq, gmu); > > + /* Drop reference taken in of_find_device_by_node */ > + put_device(gmu->dev); > + > gmu->initialized = false; > } > > @@ -1277,12 +1280,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node) > /* Get the list of clocks */ > ret = a6xx_gmu_clocks_probe(gmu); > if (ret) > - return ret; > + goto err_put_device; > > /* Set up the IOMMU context bank */ > ret = a6xx_gmu_memory_probe(gmu); > if (ret) > - return ret; > + goto err_put_device; > > /* Allocate memory for for the HFI queues */ > gmu->hfi = a6xx_gmu_memory_alloc(gmu, SZ_16K); > @@ -1334,6 +1337,11 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node) > > iommu_domain_free(gmu->domain); > } > + ret = -ENODEV; > > - return -ENODEV; > +err_put_device: > + /* Drop reference taken in of_find_device_by_node */ > + put_device(gmu->dev); > + > + return ret; > } > -- > Sean Paul, Software Engineer, Google / Chromium OS > -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jordan Crouse Subject: Re: [PATCH v2 5/6] drm/msm/a6xx: Drop the device reference in gmu Date: Thu, 23 May 2019 14:52:27 -0600 Message-ID: <20190523205226.GF18360@jcrouse1-lnx.qualcomm.com> References: <20190523171653.138678-1-sean@poorly.run> <20190523171653.138678-5-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20190523171653.138678-5-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Sean Paul Cc: Sean Paul , Rob Clark , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBNYXkgMjMsIDIwMTkgYXQgMDE6MTY6NDRQTSAtMDQwMCwgU2VhbiBQYXVsIHdyb3Rl Ogo+IEZyb206IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgo+IAo+IG9mX2ZpbmRf ZGV2aWNlX2J5X25vZGUoKSBncmFicyBhIGRldiByZWZlcmVuY2UsIHNvIG1ha2Ugc3VyZSB3ZSBj bGVhciBpdAo+IG9uIGVycm9yIGFuZCByZW1vdmUuCj4gCj4gQ2hhbmdlcyBpbiB2MjoKPiAtIEFk ZGVkIHRvIHRoZSBzZXQgKEpvcmRhbikKPiAKPiBDYzogSm9yZGFuIENyb3VzZSA8amNyb3VzZUBj b2RlYXVyb3JhLm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9t aXVtLm9yZz4KClJldmlld2VkLWJ5OiBKb3JkYW4gQ3JvdXNlIDxqY3JvdXNlQGNvZGVhdXJvcmEu b3JnPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5jIHwgMTQg KysrKysrKysrKystLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDMgZGVs ZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2E2 eHhfZ211LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5jCj4gaW5kZXgg ZjcyNDBjOWUxMWZiLi5lMmI4MzliNWQzYmQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L21zbS9hZHJlbm8vYTZ4eF9nbXUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5v L2E2eHhfZ211LmMKPiBAQCAtMTI1Myw2ICsxMjUzLDkgQEAgdm9pZCBhNnh4X2dtdV9yZW1vdmUo c3RydWN0IGE2eHhfZ3B1ICphNnh4X2dwdSkKPiAgCWZyZWVfaXJxKGdtdS0+Z211X2lycSwgZ211 KTsKPiAgCWZyZWVfaXJxKGdtdS0+aGZpX2lycSwgZ211KTsKPiAgCj4gKwkvKiBEcm9wIHJlZmVy ZW5jZSB0YWtlbiBpbiBvZl9maW5kX2RldmljZV9ieV9ub2RlICovCj4gKwlwdXRfZGV2aWNlKGdt dS0+ZGV2KTsKPiArCj4gIAlnbXUtPmluaXRpYWxpemVkID0gZmFsc2U7Cj4gIH0KPiAgCj4gQEAg LTEyNzcsMTIgKzEyODAsMTIgQEAgaW50IGE2eHhfZ211X3Byb2JlKHN0cnVjdCBhNnh4X2dwdSAq YTZ4eF9ncHUsIHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSkKPiAgCS8qIEdldCB0aGUgbGlzdCBv ZiBjbG9ja3MgKi8KPiAgCXJldCA9IGE2eHhfZ211X2Nsb2Nrc19wcm9iZShnbXUpOwo+ICAJaWYg KHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+ICsJCWdvdG8gZXJyX3B1dF9kZXZpY2U7Cj4gIAo+ICAJ LyogU2V0IHVwIHRoZSBJT01NVSBjb250ZXh0IGJhbmsgKi8KPiAgCXJldCA9IGE2eHhfZ211X21l bW9yeV9wcm9iZShnbXUpOwo+ICAJaWYgKHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+ICsJCWdvdG8g ZXJyX3B1dF9kZXZpY2U7Cj4gIAo+ICAJLyogQWxsb2NhdGUgbWVtb3J5IGZvciBmb3IgdGhlIEhG SSBxdWV1ZXMgKi8KPiAgCWdtdS0+aGZpID0gYTZ4eF9nbXVfbWVtb3J5X2FsbG9jKGdtdSwgU1pf MTZLKTsKPiBAQCAtMTMzNCw2ICsxMzM3LDExIEBAIGludCBhNnh4X2dtdV9wcm9iZShzdHJ1Y3Qg YTZ4eF9ncHUgKmE2eHhfZ3B1LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCj4gIAo+ICAJCWlv bW11X2RvbWFpbl9mcmVlKGdtdS0+ZG9tYWluKTsKPiAgCX0KPiArCXJldCA9IC1FTk9ERVY7Cj4g IAo+IC0JcmV0dXJuIC1FTk9ERVY7Cj4gK2Vycl9wdXRfZGV2aWNlOgo+ICsJLyogRHJvcCByZWZl cmVuY2UgdGFrZW4gaW4gb2ZfZmluZF9kZXZpY2VfYnlfbm9kZSAqLwo+ICsJcHV0X2RldmljZShn bXUtPmRldik7Cj4gKwo+ICsJcmV0dXJuIHJldDsKPiAgfQo+IC0tIAo+IFNlYW4gUGF1bCwgU29m dHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCj4gCgotLSAKVGhlIFF1YWxjb21t IElubm92YXRpb24gQ2VudGVyLCBJbmMuIGlzIGEgbWVtYmVyIG9mIENvZGUgQXVyb3JhIEZvcnVt LAphIExpbnV4IEZvdW5kYXRpb24gQ29sbGFib3JhdGl2ZSBQcm9qZWN0Cl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkZyZWVkcmVubyBtYWlsaW5nIGxpc3QK RnJlZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubw==