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.8 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_GIT 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 178DAC28CC0 for ; Wed, 29 May 2019 20:56:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE72D241C6 for ; Wed, 29 May 2019 20:56:03 +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="FuwiQejB"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="OnhxSkrD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726535AbfE2Uz7 (ORCPT ); Wed, 29 May 2019 16:55:59 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59578 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726426AbfE2Uz6 (ORCPT ); Wed, 29 May 2019 16:55:58 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 82453618CE; Wed, 29 May 2019 20:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1559163357; bh=TB4M/rt699+7GpLoS9OHP7ZRv5MHTXpe7MAOFn1ir+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FuwiQejBLS/4m99GWIgPpVK2e9XkORdqMKETMunlZZMy0qk3d4c0dLYh/wgAqMXtN X7Zy9ZzypsNXDpDzYQo86FNY+2kob5bLpkO95Bs2EGPQYeEMF77wycDCA7x1iiaugs nJSV/NN2Bd1UTzyHDREdjvmEF6NmblBKqaK21ZIM= Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E89656192E; Wed, 29 May 2019 20:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1559163347; bh=TB4M/rt699+7GpLoS9OHP7ZRv5MHTXpe7MAOFn1ir+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OnhxSkrDBTnHxUssHyGW0vZs7PCS1z3HfaZYwlHPLcXL5/I/LzpKoBAQv3J/V27vP l8xO+iEqqfNVo4zst0gpmMyFqPhwglA9jAgEihn5VLAaY2KjtySe6VyhhUTILrjP4D 7mrSKsxib8vrOMrnO3Zmn2ONaTY6D0dRBvTR2dkc= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E89656192E 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 From: Jordan Crouse To: freedreno@lists.freedesktop.org Cc: jean-philippe.brucker@arm.com, linux-arm-msm@vger.kernel.org, hoegsberg@google.com, dianders@chromium.org, Sean Paul , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rob Clark , David Airlie , Daniel Vetter Subject: [PATCH v3 13/16] drm/msm: Add support to create target specific address spaces Date: Wed, 29 May 2019 14:54:49 -0600 Message-Id: <1559163292-4792-14-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559163292-4792-1-git-send-email-jcrouse@codeaurora.org> References: <1559163292-4792-1-git-send-email-jcrouse@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support to create a GPU target specific address space for a context. For those targets that support per-instance pagetables they will return a new address space set up for the instance if possible otherwise just use the global device pagetable. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/msm_drv.c | 25 ++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_gpu.h | 1 + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 4c51063..dd3eb30 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -609,6 +609,14 @@ static void load_gpu(struct drm_device *dev) mutex_unlock(&init_lock); } +static struct msm_gem_address_space *context_address_space(struct msm_gpu *gpu) +{ + if (!gpu->funcs->new_address_space) + return gpu->aspace; + + return gpu->funcs->new_address_space(gpu); +} + static int context_init(struct drm_device *dev, struct drm_file *file) { struct msm_drm_private *priv = dev->dev_private; @@ -618,9 +626,16 @@ static int context_init(struct drm_device *dev, struct drm_file *file) if (!ctx) return -ENOMEM; + ctx->aspace = context_address_space(priv->gpu); + if (IS_ERR(ctx->aspace)) { + int ret = PTR_ERR(ctx->aspace); + + kfree(ctx); + return ret; + } + msm_submitqueue_init(dev, ctx); - ctx->aspace = priv->gpu->aspace; file->driver_priv = ctx; return 0; @@ -636,8 +651,12 @@ static int msm_open(struct drm_device *dev, struct drm_file *file) return context_init(dev, file); } -static void context_close(struct msm_file_private *ctx) +static void context_close(struct msm_drm_private *priv, + struct msm_file_private *ctx) { + if (ctx->aspace != priv->gpu->aspace) + msm_gem_address_space_put(ctx->aspace); + msm_submitqueue_close(ctx); kfree(ctx); } @@ -652,7 +671,7 @@ static void msm_postclose(struct drm_device *dev, struct drm_file *file) priv->lastctx = NULL; mutex_unlock(&dev->struct_mutex); - context_close(ctx); + context_close(priv, ctx); } static irqreturn_t msm_irq(int irq, void *arg) diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index d4bf051..588d7ba 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -77,6 +77,7 @@ struct msm_gpu_funcs { void (*gpu_set_freq)(struct msm_gpu *gpu, unsigned long freq); struct msm_gem_address_space *(*create_address_space) (struct msm_gpu *gpu); + struct msm_gem_address_space *(*new_address_space)(struct msm_gpu *gpu); }; struct msm_gpu { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jordan Crouse Subject: [PATCH v3 13/16] drm/msm: Add support to create target specific address spaces Date: Wed, 29 May 2019 14:54:49 -0600 Message-ID: <1559163292-4792-14-git-send-email-jcrouse@codeaurora.org> References: <1559163292-4792-1-git-send-email-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1559163292-4792-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: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Airlie , Rob Clark , hoegsberg-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, Daniel Vetter , Sean Paul List-Id: dri-devel@lists.freedesktop.org QWRkIHN1cHBvcnQgdG8gY3JlYXRlIGEgR1BVIHRhcmdldCBzcGVjaWZpYyBhZGRyZXNzIHNwYWNl IGZvcgphIGNvbnRleHQuIEZvciB0aG9zZSB0YXJnZXRzIHRoYXQgc3VwcG9ydCBwZXItaW5zdGFu Y2UKcGFnZXRhYmxlcyB0aGV5IHdpbGwgcmV0dXJuIGEgbmV3IGFkZHJlc3Mgc3BhY2Ugc2V0IHVw IGZvcgp0aGUgaW5zdGFuY2UgaWYgcG9zc2libGUgb3RoZXJ3aXNlIGp1c3QgdXNlIHRoZSBnbG9i YWwKZGV2aWNlIHBhZ2V0YWJsZS4KClNpZ25lZC1vZmYtYnk6IEpvcmRhbiBDcm91c2UgPGpjcm91 c2VAY29kZWF1cm9yYS5vcmc+Ci0tLQoKIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jIHwg MjUgKysrKysrKysrKysrKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1 LmggfCAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9kcnYuYwppbmRleCA0YzUxMDYzLi5kZDNlYjMwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L21zbV9kcnYuYwpAQCAtNjA5LDYgKzYwOSwxNCBAQCBzdGF0aWMgdm9pZCBsb2FkX2dwdShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCW11dGV4X3VubG9jaygmaW5pdF9sb2NrKTsKIH0KIAorc3Rh dGljIHN0cnVjdCBtc21fZ2VtX2FkZHJlc3Nfc3BhY2UgKmNvbnRleHRfYWRkcmVzc19zcGFjZShz dHJ1Y3QgbXNtX2dwdSAqZ3B1KQoreworCWlmICghZ3B1LT5mdW5jcy0+bmV3X2FkZHJlc3Nfc3Bh Y2UpCisJCXJldHVybiBncHUtPmFzcGFjZTsKKworCXJldHVybiBncHUtPmZ1bmNzLT5uZXdfYWRk cmVzc19zcGFjZShncHUpOworfQorCiBzdGF0aWMgaW50IGNvbnRleHRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiB7CiAJc3RydWN0IG1zbV9kcm1f cHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC02MTgsOSArNjI2LDE2IEBAIHN0 YXRpYyBpbnQgY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1f ZmlsZSAqZmlsZSkKIAlpZiAoIWN0eCkKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwljdHgtPmFzcGFj ZSA9IGNvbnRleHRfYWRkcmVzc19zcGFjZShwcml2LT5ncHUpOworCWlmIChJU19FUlIoY3R4LT5h c3BhY2UpKSB7CisJCWludCByZXQgPSBQVFJfRVJSKGN0eC0+YXNwYWNlKTsKKworCQlrZnJlZShj dHgpOworCQlyZXR1cm4gcmV0OworCX0KKwogCW1zbV9zdWJtaXRxdWV1ZV9pbml0KGRldiwgY3R4 KTsKIAotCWN0eC0+YXNwYWNlID0gcHJpdi0+Z3B1LT5hc3BhY2U7CiAJZmlsZS0+ZHJpdmVyX3By aXYgPSBjdHg7CiAKIAlyZXR1cm4gMDsKQEAgLTYzNiw4ICs2NTEsMTIgQEAgc3RhdGljIGludCBt c21fb3BlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJ cmV0dXJuIGNvbnRleHRfaW5pdChkZXYsIGZpbGUpOwogfQogCi1zdGF0aWMgdm9pZCBjb250ZXh0 X2Nsb3NlKHN0cnVjdCBtc21fZmlsZV9wcml2YXRlICpjdHgpCitzdGF0aWMgdm9pZCBjb250ZXh0 X2Nsb3NlKHN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYsCisJCXN0cnVjdCBtc21fZmlsZV9w cml2YXRlICpjdHgpCiB7CisJaWYgKGN0eC0+YXNwYWNlICE9IHByaXYtPmdwdS0+YXNwYWNlKQor CQltc21fZ2VtX2FkZHJlc3Nfc3BhY2VfcHV0KGN0eC0+YXNwYWNlKTsKKwogCW1zbV9zdWJtaXRx dWV1ZV9jbG9zZShjdHgpOwogCWtmcmVlKGN0eCk7CiB9CkBAIC02NTIsNyArNjcxLDcgQEAgc3Rh dGljIHZvaWQgbXNtX3Bvc3RjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpCiAJCXByaXYtPmxhc3RjdHggPSBOVUxMOwogCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JY29udGV4dF9jbG9zZShjdHgpOworCWNvbnRleHRfY2xvc2Uo cHJpdiwgY3R4KTsKIH0KIAogc3RhdGljIGlycXJldHVybl90IG1zbV9pcnEoaW50IGlycSwgdm9p ZCAqYXJnKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmggYi9kcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuaAppbmRleCBkNGJmMDUxLi41ODhkN2JhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9ncHUuaApAQCAtNzcsNiArNzcsNyBAQCBzdHJ1Y3QgbXNtX2dwdV9mdW5jcyB7CiAJ dm9pZCAoKmdwdV9zZXRfZnJlcSkoc3RydWN0IG1zbV9ncHUgKmdwdSwgdW5zaWduZWQgbG9uZyBm cmVxKTsKIAlzdHJ1Y3QgbXNtX2dlbV9hZGRyZXNzX3NwYWNlICooKmNyZWF0ZV9hZGRyZXNzX3Nw YWNlKQogCQkoc3RydWN0IG1zbV9ncHUgKmdwdSk7CisJc3RydWN0IG1zbV9nZW1fYWRkcmVzc19z cGFjZSAqKCpuZXdfYWRkcmVzc19zcGFjZSkoc3RydWN0IG1zbV9ncHUgKmdwdSk7CiB9OwogCiBz dHJ1Y3QgbXNtX2dwdSB7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApGcmVlZHJlbm9AbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZnJlZWRyZW5v