From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Andersson Subject: Re: [PATCH] drm/msm: Remove pm_runtime calls from msm_iommu.c Date: Tue, 19 Feb 2019 12:11:35 -0800 Message-ID: <20190219201135.GA20679@builder> References: <1550602100-14169-1-git-send-email-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1550602100-14169-1-git-send-email-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Jordan Crouse Cc: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, David Airlie , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Kristian Kristensen , Doug Anderson , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Clark , Daniel Vetter , Sean Paul List-Id: linux-arm-msm@vger.kernel.org T24gVHVlIDE5IEZlYiAxMDo0OCBQU1QgMjAxOSwgSm9yZGFuIENyb3VzZSB3cm90ZToKCj4gQ3Vy cmVudGx5IHRoZSBJT01NVSBjb2RlIGNhbGxzIHBtX3J1bnRpbWVfZ2V0L3B1dCBvbiB0aGUgR1BV IG9yIGRpc3BsYXkKPiBkZXZpY2UgYmVmb3JlIGRvaW5nIGEgSU9NTVUgb3BlcmF0aW9uLiBUaGlz IHdhcyBiZWNhdXNlIHVzdWFsbHkgdGhlCj4gSU9NTVUgZHJpdmVyIGRpZG4ndCBkbyBwb3dlciBj b250cm9sIG9mIGl0cyBvd24gYW5kIHNpbmNlIHRoZSBoYXJkd2FyZQo+IHVzZWQgdGhlIHNhbWUg Y2xvY2tzIGFuZCBwb3dlciBhcyB0aGUgcmVzcGVjdGl2ZSBtdWx0aW1lZGlhIGRldmljZSBpdAo+ IHdhcyBhIGVhc3kgd2F5IHRvIG1ha2Ugc3VyZSB0aGF0IHRoZSBwb3dlciB3YXMgYXZhaWxhYmxl Lgo+IAo+IE5vdyB0d28gdGhpbmdzIGhhdmUgY2hhbmdlZC4gRmlyc3QsIHRoZSBTTU1VIGRldmlj ZXMgY2FuIGRvIHRoZWlyIG93biBwb3dlcgo+IGNvbnRyb2wgYW5kIG1vcmUgaW1wb3J0YW50IGJy aW5naW5nIHVwIHRoZSBhNnh4IEdQVSBpc24ndCBhcyBlYXN5IGFzCj4gdHVybmluZyBvbiBzb21l IGNsb2Nrcy4gVG8gYnJpbmcgdGhlIEdQVSB1cCB3ZSBuZWVkIHRoZSBHTVUgd2hpY2ggaXRzZWxm Cj4gbmVlZHMgdGhlIElPTU1VIHNvIHdlIGhhdmUgYSBjaGlja2VuIGFuZCBlZ2cgcHJvYmxlbS4K PiAKPiBMdWNraWx5IHRoaXMgaXMgZWFzaWx5IGZpeGVkIGJ5IHJlbW92aW5nIHRoZSBwbV9ydW50 aW1lIGNhbGxzIGZyb20gdGhlCj4gZnVuY3Rpb25zIGFuZCBsZXR0aW5nIHRoZSBkZXZpY2UgbGlu ayB0byB0aGUgSU9NTVUgZGV2aWNlIGhhbmRsZSB0aGUgbWFnaWMuCj4gCj4gU2lnbmVkLW9mZi1i eTogSm9yZGFuIENyb3VzZSA8amNyb3VzZUBjb2RlYXVyb3JhLm9yZz4KClRoYW5rcyBmb3IgdGhl IHBhdGNoIEpvcmRhbiwgdGhpcyByZXNvbHZlcyB0aGUgcHJldmlvdXNseSBzZWVuIHNwbGF0IGFu ZAp0aGUgR1BVIGRyaXZlciBpcyBub3cgaGFwcGlseSBpbml0aWFsaXplZC4KClRlc3RlZC1ieTog Qmpvcm4gQW5kZXJzc29uIDxiam9ybi5hbmRlcnNzb25AbGluYXJvLm9yZz4KClJlZ2FyZHMsCkJq b3JuCgo+IC0tLQo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9pb21tdS5jIHwgMTMgKy0t LS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEyIGRlbGV0aW9u cygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9pb21tdS5jIGIv ZHJpdmVycy9ncHUvZHJtL21zbS9tc21faW9tbXUuYwo+IGluZGV4IDRkNjI3OTAuLjEyYmI1NGMg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21faW9tbXUuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9tc20vbXNtX2lvbW11LmMKPiBAQCAtMzgsMTMgKzM4LDggQEAgc3RhdGlj IGludCBtc21faW9tbXVfYXR0YWNoKHN0cnVjdCBtc21fbW11ICptbXUsIGNvbnN0IGNoYXIgKiBj b25zdCAqbmFtZXMsCj4gIAkJCSAgICBpbnQgY250KQo+ICB7Cj4gIAlzdHJ1Y3QgbXNtX2lvbW11 ICppb21tdSA9IHRvX21zbV9pb21tdShtbXUpOwo+IC0JaW50IHJldDsKPiAgCj4gLQlwbV9ydW50 aW1lX2dldF9zeW5jKG1tdS0+ZGV2KTsKPiAtCXJldCA9IGlvbW11X2F0dGFjaF9kZXZpY2UoaW9t bXUtPmRvbWFpbiwgbW11LT5kZXYpOwo+IC0JcG1fcnVudGltZV9wdXRfc3luYyhtbXUtPmRldik7 Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiArCXJldHVybiBpb21tdV9hdHRhY2hfZGV2aWNlKGlvbW11 LT5kb21haW4sIG1tdS0+ZGV2KTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgbXNtX2lvbW11X2Rl dGFjaChzdHJ1Y3QgbXNtX21tdSAqbW11LCBjb25zdCBjaGFyICogY29uc3QgKm5hbWVzLAo+IEBA IC01Miw5ICs0Nyw3IEBAIHN0YXRpYyB2b2lkIG1zbV9pb21tdV9kZXRhY2goc3RydWN0IG1zbV9t bXUgKm1tdSwgY29uc3QgY2hhciAqIGNvbnN0ICpuYW1lcywKPiAgewo+ICAJc3RydWN0IG1zbV9p b21tdSAqaW9tbXUgPSB0b19tc21faW9tbXUobW11KTsKPiAgCj4gLQlwbV9ydW50aW1lX2dldF9z eW5jKG1tdS0+ZGV2KTsKPiAgCWlvbW11X2RldGFjaF9kZXZpY2UoaW9tbXUtPmRvbWFpbiwgbW11 LT5kZXYpOwo+IC0JcG1fcnVudGltZV9wdXRfc3luYyhtbXUtPmRldik7Cj4gIH0KPiAgCj4gIHN0 YXRpYyBpbnQgbXNtX2lvbW11X21hcChzdHJ1Y3QgbXNtX21tdSAqbW11LCB1aW50NjRfdCBpb3Zh LAo+IEBAIC02Myw5ICs1Niw3IEBAIHN0YXRpYyBpbnQgbXNtX2lvbW11X21hcChzdHJ1Y3QgbXNt X21tdSAqbW11LCB1aW50NjRfdCBpb3ZhLAo+ICAJc3RydWN0IG1zbV9pb21tdSAqaW9tbXUgPSB0 b19tc21faW9tbXUobW11KTsKPiAgCXNpemVfdCByZXQ7Cj4gIAo+IC0vLwlwbV9ydW50aW1lX2dl dF9zeW5jKG1tdS0+ZGV2KTsKPiAgCXJldCA9IGlvbW11X21hcF9zZyhpb21tdS0+ZG9tYWluLCBp b3ZhLCBzZ3QtPnNnbCwgc2d0LT5uZW50cywgcHJvdCk7Cj4gLS8vCXBtX3J1bnRpbWVfcHV0X3N5 bmMobW11LT5kZXYpOwo+ICAJV0FSTl9PTighcmV0KTsKPiAgCj4gIAlyZXR1cm4gKHJldCA9PSBs ZW4pID8gMCA6IC1FSU5WQUw7Cj4gQEAgLTc1LDkgKzY2LDcgQEAgc3RhdGljIGludCBtc21faW9t bXVfdW5tYXAoc3RydWN0IG1zbV9tbXUgKm1tdSwgdWludDY0X3QgaW92YSwgdW5zaWduZWQgbGVu KQo+ICB7Cj4gIAlzdHJ1Y3QgbXNtX2lvbW11ICppb21tdSA9IHRvX21zbV9pb21tdShtbXUpOwo+ ICAKPiAtCXBtX3J1bnRpbWVfZ2V0X3N5bmMobW11LT5kZXYpOwo+ICAJaW9tbXVfdW5tYXAoaW9t bXUtPmRvbWFpbiwgaW92YSwgbGVuKTsKPiAtCXBtX3J1bnRpbWVfcHV0X3N5bmMobW11LT5kZXYp Owo+ICAKPiAgCXJldHVybiAwOwo+ICB9Cj4gLS0gCj4gMi43LjQKPiAKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApG cmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5v 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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 185A2C43381 for ; Tue, 19 Feb 2019 20:11:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2AB7206BA for ; Tue, 19 Feb 2019 20:11:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d1qUc6/k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729438AbfBSULQ (ORCPT ); Tue, 19 Feb 2019 15:11:16 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:39037 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727402AbfBSULQ (ORCPT ); Tue, 19 Feb 2019 15:11:16 -0500 Received: by mail-pg1-f196.google.com with SMTP id r11so10633497pgp.6 for ; Tue, 19 Feb 2019 12:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=O5JLttYh/1G++sqKFOhW8cSG93X4ASg01spQwU1MnzU=; b=d1qUc6/kMP67PTIvtyXBHhj5BoRyH/ul1Nx4JYxFb9DtFiLhVzCwmMOkEQQ1wV69vz j0P/L9NH54xqbyNvirOP2qUclBrF3ikt/3pXxG/JMQ29GlIO/0Bg/2nxE8dBWPZr7TwO EIknNn3pDnr+TQulPj+iIXWBSQxf8YWW8tT8ZtlU1r7mbTkFMjpO+2FSzi1Gm6lCc7Ij bmM73WRCDtSA45+6tNhaqQTevrRz90w9P5lDE4txuvg8lN5lmeu5Hdq9rLkMGTVqGimo /NhFG0hdyRPo4SMzocs1dePbm0hhY4cUdo4FaQxoKNofA8v+G59ul41FuRlqUAVAzMS3 +6Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=O5JLttYh/1G++sqKFOhW8cSG93X4ASg01spQwU1MnzU=; b=T7HwIO0Kqng1wK5DNfah4nNghY4C6FjBWLDiylO/MW2csPzPNic5yRUdQIrt1n5HK7 Z+3J7r7sQgo3Y15/ZfdAloL7VQlh0GBclO9oNYP8/p+1lSNEuxqjcXKgQJs/Ikt365je G/jEJkELZozA6ykS7elJdUF+2TevJHbUgxM0KNKQhWmZWeOPxJgy7+ZEKLGU0jmG+LTj evWwZ/WhuJkwREt9hjIAbpPxadZOC/ehmoBWe/2B29PmGvabCgJYGQcls79lwxXKPJTU ++mV2tVtniDjFVaVDh08QcTiJG6SOmdwp3l3IY/R9Q7gCLoHvI2YjDJF6jnt6I92vykl oKWA== X-Gm-Message-State: AHQUAubE/Dr+hlxjJd4vh3nQcx7ec7xdxXdeJOKslioHGRk3GLJge4Nx EsCqTkOSGcq3e1Q+1Kc5SP7b/LhnWME= X-Google-Smtp-Source: AHgI3Ib85gs6/JfFUisRwklhgb0qVEmd/Rth4LCwROPztblV47wJnhtzw/6vbYm6dBiCs6mzf4k+fA== X-Received: by 2002:a65:6099:: with SMTP id t25mr29238686pgu.448.1550607074809; Tue, 19 Feb 2019 12:11:14 -0800 (PST) Received: from builder (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id b4sm18550309pgq.57.2019.02.19.12.11.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 12:11:13 -0800 (PST) Date: Tue, 19 Feb 2019 12:11:35 -0800 From: Bjorn Andersson To: Jordan Crouse Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Sean Paul , Doug Anderson , Kristian Kristensen , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , David Airlie , Daniel Vetter Subject: Re: [PATCH] drm/msm: Remove pm_runtime calls from msm_iommu.c Message-ID: <20190219201135.GA20679@builder> References: <1550602100-14169-1-git-send-email-jcrouse@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1550602100-14169-1-git-send-email-jcrouse@codeaurora.org> User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue 19 Feb 10:48 PST 2019, Jordan Crouse wrote: > Currently the IOMMU code calls pm_runtime_get/put on the GPU or display > device before doing a IOMMU operation. This was because usually the > IOMMU driver didn't do power control of its own and since the hardware > used the same clocks and power as the respective multimedia device it > was a easy way to make sure that the power was available. > > Now two things have changed. First, the SMMU devices can do their own power > control and more important bringing up the a6xx GPU isn't as easy as > turning on some clocks. To bring the GPU up we need the GMU which itself > needs the IOMMU so we have a chicken and egg problem. > > Luckily this is easily fixed by removing the pm_runtime calls from the > functions and letting the device link to the IOMMU device handle the magic. > > Signed-off-by: Jordan Crouse Thanks for the patch Jordan, this resolves the previously seen splat and the GPU driver is now happily initialized. Tested-by: Bjorn Andersson Regards, Bjorn > --- > > drivers/gpu/drm/msm/msm_iommu.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c > index 4d62790..12bb54c 100644 > --- a/drivers/gpu/drm/msm/msm_iommu.c > +++ b/drivers/gpu/drm/msm/msm_iommu.c > @@ -38,13 +38,8 @@ static int msm_iommu_attach(struct msm_mmu *mmu, const char * const *names, > int cnt) > { > struct msm_iommu *iommu = to_msm_iommu(mmu); > - int ret; > > - pm_runtime_get_sync(mmu->dev); > - ret = iommu_attach_device(iommu->domain, mmu->dev); > - pm_runtime_put_sync(mmu->dev); > - > - return ret; > + return iommu_attach_device(iommu->domain, mmu->dev); > } > > static void msm_iommu_detach(struct msm_mmu *mmu, const char * const *names, > @@ -52,9 +47,7 @@ static void msm_iommu_detach(struct msm_mmu *mmu, const char * const *names, > { > struct msm_iommu *iommu = to_msm_iommu(mmu); > > - pm_runtime_get_sync(mmu->dev); > iommu_detach_device(iommu->domain, mmu->dev); > - pm_runtime_put_sync(mmu->dev); > } > > static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova, > @@ -63,9 +56,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova, > struct msm_iommu *iommu = to_msm_iommu(mmu); > size_t ret; > > -// pm_runtime_get_sync(mmu->dev); > ret = iommu_map_sg(iommu->domain, iova, sgt->sgl, sgt->nents, prot); > -// pm_runtime_put_sync(mmu->dev); > WARN_ON(!ret); > > return (ret == len) ? 0 : -EINVAL; > @@ -75,9 +66,7 @@ static int msm_iommu_unmap(struct msm_mmu *mmu, uint64_t iova, unsigned len) > { > struct msm_iommu *iommu = to_msm_iommu(mmu); > > - pm_runtime_get_sync(mmu->dev); > iommu_unmap(iommu->domain, iova, len); > - pm_runtime_put_sync(mmu->dev); > > return 0; > } > -- > 2.7.4 >