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=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 E00B1C433E6 for ; Tue, 1 Sep 2020 05:30:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAADE208CA for ; Tue, 1 Sep 2020 05:30:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EyLH6/8l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726117AbgIAFaz (ORCPT ); Tue, 1 Sep 2020 01:30:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725930AbgIAFax (ORCPT ); Tue, 1 Sep 2020 01:30:53 -0400 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD0C7C061290 for ; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) Received: by mail-ot1-x343.google.com with SMTP id c10so122866otm.13 for ; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=EyLH6/8lTL8tRjy57PK77UKsuw/GI4mHWlZW3NfzdSJiksHmEt7i0AcALGBNfFnKLq wut/6XY7pp2SF4k4CERx3auDlwTMEPva/jiYhB1dSxfJdgp1RmI+/7zEIqVxF8D38Aah LT3IvIhhTpv/jD4EHBxeiiLsli8PBTvq3rtanxAmndQoTA+J+vH8FdaAQ1sXpUW+7wHu BqMh+cS7gcD/BI3IiTvKE/sQTyn9uAs5+Smh1Nsfay+IJRE43IgulF+phRD9vaWdIMvk YQoDFUIrAQR1WrccH64OI7gGCng52cddpKYz1NNJ3OXYcdny0UqMshidqmMkyuElMEWa AV+g== 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=ldpKesZyNL7uBj+ShcjiaIOGC0ez3bL9TvrCtoz6DuHOUwXl06uzl/ZFC2ndH/60O+ ClwLnP2RCMgY/HWbBLib/69V3hT3SqWiTiw7v48AKDbkOyyv+8WT2SatacarVCROMl30 RkkBjT8JIwqVUyY1/Epb8uHHclF1bpxtgI/cnHOCsgFCPDD2EHTtCvaci74asZfDsJnl 70LUXIQZdFJPYbBSG8WSLNTKbMd8gA5M/LCYUb7EhYhwH1bLsZb071+bxM97Q2/NC7a4 AGUhgBZV4hdxXR2zs4VCgfNtX0TTHT6iqq1btgD/p0myXlVLbo3ZyzQpWCljwOeKSYoV IjfQ== X-Gm-Message-State: AOAM533L1odI4rXSbTOvxyW6cXgIg0KDfhMm1FfXsiUushlT0ew6DEOn skDULD97u+Exkg6lJY1vCcJGiw== X-Google-Smtp-Source: ABdhPJxg1JFA4u445ylEbw3QrlOB7WkbXj2mOBGSI1Rj8kIR5ol1ujEOECLgvFYGyi5+IjeYzHmLgA== X-Received: by 2002:a9d:4e9a:: with SMTP id v26mr217600otk.106.1598938252120; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) Received: from yoga ([2605:6000:e5cb:c100:8898:14ff:fe6d:34e]) by smtp.gmail.com with ESMTPSA id k1sm45479oot.20.2020.08.31.22.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 22:30:51 -0700 (PDT) Date: Tue, 1 Sep 2020 00:30:47 -0500 From: Bjorn Andersson To: Rob Clark Cc: dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linux-arm-msm@vger.kernel.org, Sai Prakash Ranjan , Will Deacon , freedreno@lists.freedesktop.org, Sibi Sankar , Vivek Gautam , Stephen Boyd , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org, Jordan Crouse , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , open list Subject: Re: [PATCH 15/19] drm/msm: Add support for private address space instances Message-ID: <20200901053047.GW3715@yoga> References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-16-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200814024114.1177553-16-robdclark@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > From: Jordan Crouse > > Add support for allocating private address space instances. Targets that > support per-context pagetables should implement their own function to > allocate private address spaces. > > The default will return a pointer to the global address space. > Reviewed-by: Bjorn Andersson > Signed-off-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_drv.c | 13 +++++++------ > drivers/gpu/drm/msm/msm_drv.h | 5 +++++ > drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++++ > drivers/gpu/drm/msm/msm_gpu.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > 5 files changed, 48 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 01845a3b8d52..8e70d220bba8 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -597,7 +597,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > kref_init(&ctx->ref); > msm_submitqueue_init(dev, ctx); > > - ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL; > + ctx->aspace = msm_gpu_create_private_address_space(priv->gpu); > file->driver_priv = ctx; > > return 0; > @@ -780,18 +780,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, > } > > static int msm_ioctl_gem_info_iova(struct drm_device *dev, > - struct drm_gem_object *obj, uint64_t *iova) > + struct drm_file *file, struct drm_gem_object *obj, > + uint64_t *iova) > { > - struct msm_drm_private *priv = dev->dev_private; > + struct msm_file_private *ctx = file->driver_priv; > > - if (!priv->gpu) > + if (!ctx->aspace) > return -EINVAL; > > /* > * Don't pin the memory here - just get an address so that userspace can > * be productive > */ > - return msm_gem_get_iova(obj, priv->gpu->aspace, iova); > + return msm_gem_get_iova(obj, ctx->aspace, iova); > } > > static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > @@ -830,7 +831,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > args->value = msm_gem_mmap_offset(obj); > break; > case MSM_INFO_GET_IOVA: > - ret = msm_ioctl_gem_info_iova(dev, obj, &args->value); > + ret = msm_ioctl_gem_info_iova(dev, file, obj, &args->value); > break; > case MSM_INFO_SET_NAME: > /* length check should leave room for terminating null: */ > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 4561bfb5e745..2ca9c3c03845 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -249,6 +249,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace, > void msm_gem_close_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma); > > + > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace); > + > void msm_gem_address_space_put(struct msm_gem_address_space *aspace); > > struct msm_gem_address_space * > @@ -434,6 +438,7 @@ static inline void __msm_file_private_destroy(struct kref *kref) > struct msm_file_private *ctx = container_of(kref, > struct msm_file_private, ref); > > + msm_gem_address_space_put(ctx->aspace); > kfree(ctx); > } > > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > index 5f6a11211b64..29cc1305cf37 100644 > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > @@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace) > kref_put(&aspace->kref, msm_gem_address_space_destroy); > } > > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace) > +{ > + if (!IS_ERR_OR_NULL(aspace)) > + kref_get(&aspace->kref); > + > + return aspace; > +} > + > /* Actually unmap memory for the vma */ > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma) > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index e1a3cbe25a0c..951850804d77 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -823,6 +823,28 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) > return 0; > } > > +/* Return a new address space for a msm_drm_private instance */ > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu) > +{ > + struct msm_gem_address_space *aspace = NULL; > + > + if (!gpu) > + return NULL; > + > + /* > + * If the target doesn't support private address spaces then return > + * the global one > + */ > + if (gpu->funcs->create_private_address_space) > + aspace = gpu->funcs->create_private_address_space(gpu); > + > + if (IS_ERR_OR_NULL(aspace)) > + aspace = msm_gem_address_space_get(gpu->aspace); > + > + return aspace; > +} > + > int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config) > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 1f96ac0d9049..4052a18e18c2 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -65,6 +65,8 @@ struct msm_gpu_funcs { > void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp); > struct msm_gem_address_space *(*create_address_space) > (struct msm_gpu *gpu, struct platform_device *pdev); > + struct msm_gem_address_space *(*create_private_address_space) > + (struct msm_gpu *gpu); > }; > > struct msm_gpu { > @@ -295,6 +297,9 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config); > > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu); > + > void msm_gpu_cleanup(struct msm_gpu *gpu); > > struct msm_gpu *adreno_load_gpu(struct drm_device *dev); > -- > 2.26.2 > 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 3C920C433E7 for ; Tue, 1 Sep 2020 05:30:57 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B663208CA for ; Tue, 1 Sep 2020 05:30:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EyLH6/8l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B663208CA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E33CD86144; Tue, 1 Sep 2020 05:30:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IjNUJ0V-0sir; Tue, 1 Sep 2020 05:30:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id DF275860CF; Tue, 1 Sep 2020 05:30:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B808BC088B; Tue, 1 Sep 2020 05:30:55 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 12557C0052 for ; Tue, 1 Sep 2020 05:30:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F172386113 for ; Tue, 1 Sep 2020 05:30:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m06ejaSGPDyY for ; Tue, 1 Sep 2020 05:30:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0515C860CF for ; Tue, 1 Sep 2020 05:30:53 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id a65so133666otc.8 for ; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=EyLH6/8lTL8tRjy57PK77UKsuw/GI4mHWlZW3NfzdSJiksHmEt7i0AcALGBNfFnKLq wut/6XY7pp2SF4k4CERx3auDlwTMEPva/jiYhB1dSxfJdgp1RmI+/7zEIqVxF8D38Aah LT3IvIhhTpv/jD4EHBxeiiLsli8PBTvq3rtanxAmndQoTA+J+vH8FdaAQ1sXpUW+7wHu BqMh+cS7gcD/BI3IiTvKE/sQTyn9uAs5+Smh1Nsfay+IJRE43IgulF+phRD9vaWdIMvk YQoDFUIrAQR1WrccH64OI7gGCng52cddpKYz1NNJ3OXYcdny0UqMshidqmMkyuElMEWa AV+g== 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=mghr/PIYvg1QLJmjv5QRWb4i4uVEeFIEbucofVwpnpn8dJDPH9ETXUVa4TAhxCn9X9 TydCNz0oEJujNPkInNl+VqApUvPTuSjTVRBB1q+XGmSsotv3fqxu/OStNH4ARYnD5juu 6NgIlcVDdbGUquX8cFnk4Q7KgexaUgGKd0NTrBoRRD3RCGmgibeKQwtz04AnbV7n0kh1 wUK0cSzklhrJ9Mr/vzidEW769PbuDusxwZOwoZhulMJFbYGOFluzbYamEAt5w/75PjLp 3TyW3VW7agcjRr/oXXblvIwGj9oK0C/zlvLYqEeyGJM+QIRjfzl/228DQuPWFdOEDGpA gSpw== X-Gm-Message-State: AOAM533oAFoax3tb/Ab1m7eiplvQrF9j6Qu2vs8B9rgrD4A/QW6MFKKU trBTlD3sF4nwZjaPHWg5wtdk6Q== X-Google-Smtp-Source: ABdhPJxg1JFA4u445ylEbw3QrlOB7WkbXj2mOBGSI1Rj8kIR5ol1ujEOECLgvFYGyi5+IjeYzHmLgA== X-Received: by 2002:a9d:4e9a:: with SMTP id v26mr217600otk.106.1598938252120; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) Received: from yoga ([2605:6000:e5cb:c100:8898:14ff:fe6d:34e]) by smtp.gmail.com with ESMTPSA id k1sm45479oot.20.2020.08.31.22.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 22:30:51 -0700 (PDT) Date: Tue, 1 Sep 2020 00:30:47 -0500 From: Bjorn Andersson To: Rob Clark Subject: Re: [PATCH 15/19] drm/msm: Add support for private address space instances Message-ID: <20200901053047.GW3715@yoga> References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-16-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200814024114.1177553-16-robdclark@gmail.com> Cc: Rob Clark , open list , Daniel Vetter , Will Deacon , David Airlie , linux-arm-msm@vger.kernel.org, Robin Murphy , dri-devel@lists.freedesktop.org, Stephen Boyd , Sean Paul , iommu@lists.linux-foundation.org, Sibi Sankar , Vivek Gautam , freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > From: Jordan Crouse > > Add support for allocating private address space instances. Targets that > support per-context pagetables should implement their own function to > allocate private address spaces. > > The default will return a pointer to the global address space. > Reviewed-by: Bjorn Andersson > Signed-off-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_drv.c | 13 +++++++------ > drivers/gpu/drm/msm/msm_drv.h | 5 +++++ > drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++++ > drivers/gpu/drm/msm/msm_gpu.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > 5 files changed, 48 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 01845a3b8d52..8e70d220bba8 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -597,7 +597,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > kref_init(&ctx->ref); > msm_submitqueue_init(dev, ctx); > > - ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL; > + ctx->aspace = msm_gpu_create_private_address_space(priv->gpu); > file->driver_priv = ctx; > > return 0; > @@ -780,18 +780,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, > } > > static int msm_ioctl_gem_info_iova(struct drm_device *dev, > - struct drm_gem_object *obj, uint64_t *iova) > + struct drm_file *file, struct drm_gem_object *obj, > + uint64_t *iova) > { > - struct msm_drm_private *priv = dev->dev_private; > + struct msm_file_private *ctx = file->driver_priv; > > - if (!priv->gpu) > + if (!ctx->aspace) > return -EINVAL; > > /* > * Don't pin the memory here - just get an address so that userspace can > * be productive > */ > - return msm_gem_get_iova(obj, priv->gpu->aspace, iova); > + return msm_gem_get_iova(obj, ctx->aspace, iova); > } > > static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > @@ -830,7 +831,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > args->value = msm_gem_mmap_offset(obj); > break; > case MSM_INFO_GET_IOVA: > - ret = msm_ioctl_gem_info_iova(dev, obj, &args->value); > + ret = msm_ioctl_gem_info_iova(dev, file, obj, &args->value); > break; > case MSM_INFO_SET_NAME: > /* length check should leave room for terminating null: */ > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 4561bfb5e745..2ca9c3c03845 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -249,6 +249,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace, > void msm_gem_close_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma); > > + > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace); > + > void msm_gem_address_space_put(struct msm_gem_address_space *aspace); > > struct msm_gem_address_space * > @@ -434,6 +438,7 @@ static inline void __msm_file_private_destroy(struct kref *kref) > struct msm_file_private *ctx = container_of(kref, > struct msm_file_private, ref); > > + msm_gem_address_space_put(ctx->aspace); > kfree(ctx); > } > > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > index 5f6a11211b64..29cc1305cf37 100644 > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > @@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace) > kref_put(&aspace->kref, msm_gem_address_space_destroy); > } > > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace) > +{ > + if (!IS_ERR_OR_NULL(aspace)) > + kref_get(&aspace->kref); > + > + return aspace; > +} > + > /* Actually unmap memory for the vma */ > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma) > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index e1a3cbe25a0c..951850804d77 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -823,6 +823,28 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) > return 0; > } > > +/* Return a new address space for a msm_drm_private instance */ > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu) > +{ > + struct msm_gem_address_space *aspace = NULL; > + > + if (!gpu) > + return NULL; > + > + /* > + * If the target doesn't support private address spaces then return > + * the global one > + */ > + if (gpu->funcs->create_private_address_space) > + aspace = gpu->funcs->create_private_address_space(gpu); > + > + if (IS_ERR_OR_NULL(aspace)) > + aspace = msm_gem_address_space_get(gpu->aspace); > + > + return aspace; > +} > + > int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config) > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 1f96ac0d9049..4052a18e18c2 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -65,6 +65,8 @@ struct msm_gpu_funcs { > void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp); > struct msm_gem_address_space *(*create_address_space) > (struct msm_gpu *gpu, struct platform_device *pdev); > + struct msm_gem_address_space *(*create_private_address_space) > + (struct msm_gpu *gpu); > }; > > struct msm_gpu { > @@ -295,6 +297,9 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config); > > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu); > + > void msm_gpu_cleanup(struct msm_gpu *gpu); > > struct msm_gpu *adreno_load_gpu(struct drm_device *dev); > -- > 2.26.2 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 07963C433E2 for ; Tue, 1 Sep 2020 05:32:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6DA1208CA for ; Tue, 1 Sep 2020 05:32:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T05GV58/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EyLH6/8l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6DA1208CA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XK77Sg1QPa+mRVOtzpsfbqCmbS/9GmOca2kudmGEdHk=; b=T05GV58/qMKytrs2bMsRbq6dr qLp3na9QD0kqRc6GlrnlpMKwsD3cjMrQ/bbuQKeL/Jr6/yWS0vYFZKOXBnPz3Tl3lS++ZtzPyLvrP y08XNfPbvp8Rkc5fbfVmfHPK3KLIDao6GuWfdOhuyytZ9J4fy0qYeAIL1zcR/L9Wkrsmr98Sf67cY CJPBEwvVVDraEWzcfm5KdExCDYgK35aoqw/rwhp44NlzyU2Uv04xeOqqM69RhatDiTn+B/eXU3H4P qbMC2xU3qbK9uJtwuw+eRPzCOidEahsJWjVG597yr0FYhArp0MZOnwp81X7z9toSOu+RA2kcbZ9ZX mFY9CtSUw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCysi-0007jw-Ua; Tue, 01 Sep 2020 05:30:56 +0000 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCysf-0007jA-UB for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2020 05:30:55 +0000 Received: by mail-ot1-x344.google.com with SMTP id e23so136703otk.7 for ; Mon, 31 Aug 2020 22:30:53 -0700 (PDT) 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=EyLH6/8lTL8tRjy57PK77UKsuw/GI4mHWlZW3NfzdSJiksHmEt7i0AcALGBNfFnKLq wut/6XY7pp2SF4k4CERx3auDlwTMEPva/jiYhB1dSxfJdgp1RmI+/7zEIqVxF8D38Aah LT3IvIhhTpv/jD4EHBxeiiLsli8PBTvq3rtanxAmndQoTA+J+vH8FdaAQ1sXpUW+7wHu BqMh+cS7gcD/BI3IiTvKE/sQTyn9uAs5+Smh1Nsfay+IJRE43IgulF+phRD9vaWdIMvk YQoDFUIrAQR1WrccH64OI7gGCng52cddpKYz1NNJ3OXYcdny0UqMshidqmMkyuElMEWa AV+g== 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=BASyfTdcxvGBuxFLT6i57A0NRot8sRQKC/UB3BPCcY8/o3HVWpLp+e9+gOBzEpujIj UNRprnVCv/GKi+D8O666I+WG/W3p26oyhGnUmQarsk9OlFgnAjcx50GHcnfdOa4K0bmR 940lbfFcYa6/+lHNzwR6+OaDyChN986HDT+MX1RxqsDYFkYVsEeHVFi8bvc1On3PlF0r 0gRjymZxgBB0+4p/wvPmOEYZ5mD8fEPoZJXjmR+K9QlrBe2CmTVV0/wM8Wfb0ZnDJwv1 EVxDhiwLFKAmtPGatlyNcGToh2zuzLotvHUtWcQihJIrD0CgATtnmVMJmFKlol6hl/ml QUAg== X-Gm-Message-State: AOAM530uIie4jtbLnVae/tD0BR+jdPaE6BOnwj5RVRZSd6YEXHC7STJL 8Jnm9j70sCy+wy9a7qKQZU5z2g== X-Google-Smtp-Source: ABdhPJxg1JFA4u445ylEbw3QrlOB7WkbXj2mOBGSI1Rj8kIR5ol1ujEOECLgvFYGyi5+IjeYzHmLgA== X-Received: by 2002:a9d:4e9a:: with SMTP id v26mr217600otk.106.1598938252120; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) Received: from yoga ([2605:6000:e5cb:c100:8898:14ff:fe6d:34e]) by smtp.gmail.com with ESMTPSA id k1sm45479oot.20.2020.08.31.22.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 22:30:51 -0700 (PDT) Date: Tue, 1 Sep 2020 00:30:47 -0500 From: Bjorn Andersson To: Rob Clark Subject: Re: [PATCH 15/19] drm/msm: Add support for private address space instances Message-ID: <20200901053047.GW3715@yoga> References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-16-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200814024114.1177553-16-robdclark@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_013053_976718_6F22D4C9 X-CRM114-Status: GOOD ( 28.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Sai Prakash Ranjan , Jordan Crouse , open list , Daniel Vetter , Will Deacon , David Airlie , linux-arm-msm@vger.kernel.org, Joerg Roedel , Robin Murphy , dri-devel@lists.freedesktop.org, Stephen Boyd , Sean Paul , iommu@lists.linux-foundation.org, Sibi Sankar , Vivek Gautam , freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > From: Jordan Crouse > > Add support for allocating private address space instances. Targets that > support per-context pagetables should implement their own function to > allocate private address spaces. > > The default will return a pointer to the global address space. > Reviewed-by: Bjorn Andersson > Signed-off-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_drv.c | 13 +++++++------ > drivers/gpu/drm/msm/msm_drv.h | 5 +++++ > drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++++ > drivers/gpu/drm/msm/msm_gpu.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > 5 files changed, 48 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 01845a3b8d52..8e70d220bba8 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -597,7 +597,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > kref_init(&ctx->ref); > msm_submitqueue_init(dev, ctx); > > - ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL; > + ctx->aspace = msm_gpu_create_private_address_space(priv->gpu); > file->driver_priv = ctx; > > return 0; > @@ -780,18 +780,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, > } > > static int msm_ioctl_gem_info_iova(struct drm_device *dev, > - struct drm_gem_object *obj, uint64_t *iova) > + struct drm_file *file, struct drm_gem_object *obj, > + uint64_t *iova) > { > - struct msm_drm_private *priv = dev->dev_private; > + struct msm_file_private *ctx = file->driver_priv; > > - if (!priv->gpu) > + if (!ctx->aspace) > return -EINVAL; > > /* > * Don't pin the memory here - just get an address so that userspace can > * be productive > */ > - return msm_gem_get_iova(obj, priv->gpu->aspace, iova); > + return msm_gem_get_iova(obj, ctx->aspace, iova); > } > > static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > @@ -830,7 +831,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > args->value = msm_gem_mmap_offset(obj); > break; > case MSM_INFO_GET_IOVA: > - ret = msm_ioctl_gem_info_iova(dev, obj, &args->value); > + ret = msm_ioctl_gem_info_iova(dev, file, obj, &args->value); > break; > case MSM_INFO_SET_NAME: > /* length check should leave room for terminating null: */ > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 4561bfb5e745..2ca9c3c03845 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -249,6 +249,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace, > void msm_gem_close_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma); > > + > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace); > + > void msm_gem_address_space_put(struct msm_gem_address_space *aspace); > > struct msm_gem_address_space * > @@ -434,6 +438,7 @@ static inline void __msm_file_private_destroy(struct kref *kref) > struct msm_file_private *ctx = container_of(kref, > struct msm_file_private, ref); > > + msm_gem_address_space_put(ctx->aspace); > kfree(ctx); > } > > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > index 5f6a11211b64..29cc1305cf37 100644 > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > @@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace) > kref_put(&aspace->kref, msm_gem_address_space_destroy); > } > > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace) > +{ > + if (!IS_ERR_OR_NULL(aspace)) > + kref_get(&aspace->kref); > + > + return aspace; > +} > + > /* Actually unmap memory for the vma */ > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma) > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index e1a3cbe25a0c..951850804d77 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -823,6 +823,28 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) > return 0; > } > > +/* Return a new address space for a msm_drm_private instance */ > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu) > +{ > + struct msm_gem_address_space *aspace = NULL; > + > + if (!gpu) > + return NULL; > + > + /* > + * If the target doesn't support private address spaces then return > + * the global one > + */ > + if (gpu->funcs->create_private_address_space) > + aspace = gpu->funcs->create_private_address_space(gpu); > + > + if (IS_ERR_OR_NULL(aspace)) > + aspace = msm_gem_address_space_get(gpu->aspace); > + > + return aspace; > +} > + > int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config) > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 1f96ac0d9049..4052a18e18c2 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -65,6 +65,8 @@ struct msm_gpu_funcs { > void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp); > struct msm_gem_address_space *(*create_address_space) > (struct msm_gpu *gpu, struct platform_device *pdev); > + struct msm_gem_address_space *(*create_private_address_space) > + (struct msm_gpu *gpu); > }; > > struct msm_gpu { > @@ -295,6 +297,9 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config); > > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu); > + > void msm_gpu_cleanup(struct msm_gpu *gpu); > > struct msm_gpu *adreno_load_gpu(struct drm_device *dev); > -- > 2.26.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 CEEE3C433E6 for ; Tue, 1 Sep 2020 07:32:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9847C206CD for ; Tue, 1 Sep 2020 07:32:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EyLH6/8l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9847C206CD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 851586E7D9; Tue, 1 Sep 2020 07:32:21 +0000 (UTC) Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC9CC6E15E for ; Tue, 1 Sep 2020 05:30:52 +0000 (UTC) Received: by mail-ot1-x341.google.com with SMTP id i4so149973ota.2 for ; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=EyLH6/8lTL8tRjy57PK77UKsuw/GI4mHWlZW3NfzdSJiksHmEt7i0AcALGBNfFnKLq wut/6XY7pp2SF4k4CERx3auDlwTMEPva/jiYhB1dSxfJdgp1RmI+/7zEIqVxF8D38Aah LT3IvIhhTpv/jD4EHBxeiiLsli8PBTvq3rtanxAmndQoTA+J+vH8FdaAQ1sXpUW+7wHu BqMh+cS7gcD/BI3IiTvKE/sQTyn9uAs5+Smh1Nsfay+IJRE43IgulF+phRD9vaWdIMvk YQoDFUIrAQR1WrccH64OI7gGCng52cddpKYz1NNJ3OXYcdny0UqMshidqmMkyuElMEWa AV+g== 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; bh=3bQbJ1MgVxqfRx6wQTvDAx4UH6bM5q59KkuatLbzk4Q=; b=Qx4P7KBMOh53KPfaSS/8/x1q/osV+ov4VcHLJB0pd9z5qOqu/dqvr8C/IpRrUZgata SCjRoJnJCi2dbDShIphyrxdwuYCbQf19WDPAz5fyuLCFruWBJn6AEruH0uMFIVB1gK5t B5RBAgOP0bOQbam1qZTwEGGgbJ0XmKkPpf8TIeNYWC7//5CZKU3H7SMUrVysgpg+zcIX G7FlNFnwoQvlnWSs+TcMevPXELKH19F8+J7qWB0ZRLnSqFx6/F+N7Bwi0acYBQnX29RT XCzsH6lul/NcRafUE9DGaihzYSOZ4P5UJQHiIBemnx8IiDXmP6MLseFJ2ovZQRxtWudc UtiQ== X-Gm-Message-State: AOAM531Cy8RUrJQqTqq73dz2y0+eP9dOh1b1sls7iHy82kMyWw/p606a MqBS4JrK4VHFArJgu7eq+tDZDA== X-Google-Smtp-Source: ABdhPJxg1JFA4u445ylEbw3QrlOB7WkbXj2mOBGSI1Rj8kIR5ol1ujEOECLgvFYGyi5+IjeYzHmLgA== X-Received: by 2002:a9d:4e9a:: with SMTP id v26mr217600otk.106.1598938252120; Mon, 31 Aug 2020 22:30:52 -0700 (PDT) Received: from yoga ([2605:6000:e5cb:c100:8898:14ff:fe6d:34e]) by smtp.gmail.com with ESMTPSA id k1sm45479oot.20.2020.08.31.22.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 22:30:51 -0700 (PDT) Date: Tue, 1 Sep 2020 00:30:47 -0500 From: Bjorn Andersson To: Rob Clark Subject: Re: [PATCH 15/19] drm/msm: Add support for private address space instances Message-ID: <20200901053047.GW3715@yoga> References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-16-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200814024114.1177553-16-robdclark@gmail.com> X-Mailman-Approved-At: Tue, 01 Sep 2020 07:31:54 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Sai Prakash Ranjan , open list , Will Deacon , David Airlie , linux-arm-msm@vger.kernel.org, Joerg Roedel , Robin Murphy , dri-devel@lists.freedesktop.org, Stephen Boyd , Sean Paul , iommu@lists.linux-foundation.org, Sibi Sankar , Vivek Gautam , freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > From: Jordan Crouse > > Add support for allocating private address space instances. Targets that > support per-context pagetables should implement their own function to > allocate private address spaces. > > The default will return a pointer to the global address space. > Reviewed-by: Bjorn Andersson > Signed-off-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_drv.c | 13 +++++++------ > drivers/gpu/drm/msm/msm_drv.h | 5 +++++ > drivers/gpu/drm/msm/msm_gem_vma.c | 9 +++++++++ > drivers/gpu/drm/msm/msm_gpu.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > 5 files changed, 48 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 01845a3b8d52..8e70d220bba8 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -597,7 +597,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > kref_init(&ctx->ref); > msm_submitqueue_init(dev, ctx); > > - ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL; > + ctx->aspace = msm_gpu_create_private_address_space(priv->gpu); > file->driver_priv = ctx; > > return 0; > @@ -780,18 +780,19 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, > } > > static int msm_ioctl_gem_info_iova(struct drm_device *dev, > - struct drm_gem_object *obj, uint64_t *iova) > + struct drm_file *file, struct drm_gem_object *obj, > + uint64_t *iova) > { > - struct msm_drm_private *priv = dev->dev_private; > + struct msm_file_private *ctx = file->driver_priv; > > - if (!priv->gpu) > + if (!ctx->aspace) > return -EINVAL; > > /* > * Don't pin the memory here - just get an address so that userspace can > * be productive > */ > - return msm_gem_get_iova(obj, priv->gpu->aspace, iova); > + return msm_gem_get_iova(obj, ctx->aspace, iova); > } > > static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > @@ -830,7 +831,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, > args->value = msm_gem_mmap_offset(obj); > break; > case MSM_INFO_GET_IOVA: > - ret = msm_ioctl_gem_info_iova(dev, obj, &args->value); > + ret = msm_ioctl_gem_info_iova(dev, file, obj, &args->value); > break; > case MSM_INFO_SET_NAME: > /* length check should leave room for terminating null: */ > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 4561bfb5e745..2ca9c3c03845 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -249,6 +249,10 @@ int msm_gem_map_vma(struct msm_gem_address_space *aspace, > void msm_gem_close_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma); > > + > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace); > + > void msm_gem_address_space_put(struct msm_gem_address_space *aspace); > > struct msm_gem_address_space * > @@ -434,6 +438,7 @@ static inline void __msm_file_private_destroy(struct kref *kref) > struct msm_file_private *ctx = container_of(kref, > struct msm_file_private, ref); > > + msm_gem_address_space_put(ctx->aspace); > kfree(ctx); > } > > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > index 5f6a11211b64..29cc1305cf37 100644 > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > @@ -27,6 +27,15 @@ void msm_gem_address_space_put(struct msm_gem_address_space *aspace) > kref_put(&aspace->kref, msm_gem_address_space_destroy); > } > > +struct msm_gem_address_space * > +msm_gem_address_space_get(struct msm_gem_address_space *aspace) > +{ > + if (!IS_ERR_OR_NULL(aspace)) > + kref_get(&aspace->kref); > + > + return aspace; > +} > + > /* Actually unmap memory for the vma */ > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > struct msm_gem_vma *vma) > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index e1a3cbe25a0c..951850804d77 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -823,6 +823,28 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) > return 0; > } > > +/* Return a new address space for a msm_drm_private instance */ > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu) > +{ > + struct msm_gem_address_space *aspace = NULL; > + > + if (!gpu) > + return NULL; > + > + /* > + * If the target doesn't support private address spaces then return > + * the global one > + */ > + if (gpu->funcs->create_private_address_space) > + aspace = gpu->funcs->create_private_address_space(gpu); > + > + if (IS_ERR_OR_NULL(aspace)) > + aspace = msm_gem_address_space_get(gpu->aspace); > + > + return aspace; > +} > + > int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config) > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 1f96ac0d9049..4052a18e18c2 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -65,6 +65,8 @@ struct msm_gpu_funcs { > void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp); > struct msm_gem_address_space *(*create_address_space) > (struct msm_gpu *gpu, struct platform_device *pdev); > + struct msm_gem_address_space *(*create_private_address_space) > + (struct msm_gpu *gpu); > }; > > struct msm_gpu { > @@ -295,6 +297,9 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config); > > +struct msm_gem_address_space * > +msm_gpu_create_private_address_space(struct msm_gpu *gpu); > + > void msm_gpu_cleanup(struct msm_gpu *gpu); > > struct msm_gpu *adreno_load_gpu(struct drm_device *dev); > -- > 2.26.2 > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel