From patchwork Tue Jun 6 22:31:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 104128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3712423vqr; Tue, 6 Jun 2023 15:36:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5460bcspfEIcIspx9CdvbVuiv56ADMLvd3mssHghL9n/NTp0mhUiwjZtYrHX8FzosX1Jno X-Received: by 2002:a05:620a:2995:b0:75e:b916:d573 with SMTP id r21-20020a05620a299500b0075eb916d573mr183716qkp.14.1686091003583; Tue, 06 Jun 2023 15:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686091003; cv=none; d=google.com; s=arc-20160816; b=gGZdFrqF43N1qTpLkOeYJrdCrcS9GBcHMJMbneldRaTHDh0CMFU7hbt7nr18AGOpDF 3FSVdtUMzRTAmZeZsFtDJpLcKLw3JQj2+8KET1PQWxsc0+nxi/Qm1XkpMvisiNdpwAxp fxgg5YN5YwECSof1rreznibbi3AyIxvm01jCM3VolPxlyeIpwEHj4r8bWnng5ygQDxlB kKW6rMHgBgyP9+3ViK91VnxmXTUC18mnOWrcP6xNZngctmbEoFU7s6NnnPYxV+TCxaln hnx/Eshp8tykEACOg4XG23mioO9zDAuDuZGdAGTm+9OF9TjmpqmMohm1zz4S3/CNsfnK OgrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P88UvIrom7/7J04O1khPNHpiLRIr+035xquRG7LdscM=; b=rWa7TNWBduUV9lqlBkXwxKfgOAksYVPyjEYbHtA8paOR36eHpL529ZU0t8CV4P1TbL OI/ud7r0QiInEc0pRwkRmDl6sBqzryS8NQNoKk6rD54WuWmcohPMXKsJY8npKNL2NKJY geFNqCWzd0AcGdi7B88jhBvIhf7F/Uy8pu/2+G5gaYGRbiKvSr6uo9f85oVlvLnAlW4X o6/N3PwPizgt0zi5+X5Y5+ZQHBuh8M4VhobQCmAZkpD1xa0hHOlRD0M8gTybEZA+U9pN MyrP1kwlgo6E+Jq6u0o8kQROlkYbuAENW564Ev8Bjkma7iM7z20iq2xVw3SCms5JX9bR cZ+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jMwwfFWG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g11-20020a05620a108b00b0075d4d5617d4si5066120qkk.222.2023.06.06.15.36.29; Tue, 06 Jun 2023 15:36:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jMwwfFWG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239948AbjFFWdC (ORCPT + 99 others); Tue, 6 Jun 2023 18:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239903AbjFFWcs (ORCPT ); Tue, 6 Jun 2023 18:32:48 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 689001736 for ; Tue, 6 Jun 2023 15:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686090725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P88UvIrom7/7J04O1khPNHpiLRIr+035xquRG7LdscM=; b=jMwwfFWGIM7WSbu9jIT+PgoN8LlX8nkpiKWizlTGKjbR8ZlStaxX8jeLxqkY27/YJRHUci 8/5ym48nEJ0eUgUEYG+lWEK9apKFmyqddzMYd+SIGaw4YgJ/0JsPbdCbLSsSTN91nF3GhK f7Nxhu6CPh0gh2hYI96aFCc9sQtpisQ= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609--R3YYR0jNCenluyT5elU0A-1; Tue, 06 Jun 2023 18:32:04 -0400 X-MC-Unique: -R3YYR0jNCenluyT5elU0A-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-514b8d2b21fso183384a12.1 for ; Tue, 06 Jun 2023 15:32:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686090723; x=1688682723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P88UvIrom7/7J04O1khPNHpiLRIr+035xquRG7LdscM=; b=jNRXyXd+hMnXT0OIdEBbbR5mzt5cuhSEYekLfXg3rUATUBYoTOc0J0cjOucMfSOPyz cbaqOa/Xkz7yvue5YulnmH4wZ3xciSGt1NJeAoZPA6da/bNsi/Wr5YRx4Qi0tXldR7cr y0DHwLuPJ5k3UbXbhaIjyzrj7YRMSwA+F60QbnadZBKVxzscU54dB7Ufag2sdOzPqTE6 Vi8DWtx60Cfa+bwbYoyTDAI5dzqLYP5Pov+QR4kEoIt7ILuoMmm9ll2rqXg8/0zBWne1 QVyDoAPwtcdIOt/k3CtSWf1/JSvK/+PMk5cCQQHr+XOkuHyy7yOD/f5IgR8s0//ASf81 ydKg== X-Gm-Message-State: AC+VfDwso6aYCgmZk1FbjHBzS9kMfOgR1Xh0WvYawMLhRfPh15EoZ/xn OXv0uGHgLfg6Yf8tZlbfooEd4Pk0OgP90m63Vzkc4/SX8zpsakY7FQtdrNpg7cYYyhN5NmWzQhm ohKNx10EvAJTFsOppD4n3W1Yb X-Received: by 2002:a17:907:628f:b0:96a:48ed:531d with SMTP id nd15-20020a170907628f00b0096a48ed531dmr4506637ejc.27.1686090723370; Tue, 06 Jun 2023 15:32:03 -0700 (PDT) X-Received: by 2002:a17:907:628f:b0:96a:48ed:531d with SMTP id nd15-20020a170907628f00b0096a48ed531dmr4506609ejc.27.1686090723041; Tue, 06 Jun 2023 15:32:03 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id l10-20020a1709066b8a00b00974556e50a6sm6087779ejr.114.2023.06.06.15.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:32:02 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net, christian.koenig@amd.com, bskeggs@redhat.com, Liam.Howlett@oracle.com, matthew.brost@intel.com, boris.brezillon@collabora.com, alexdeucher@gmail.com, ogabbay@kernel.org, bagasdotme@gmail.com, willy@infradead.org, jason@jlekstrand.net Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v4 06/14] drm/nouveau: get vmm via nouveau_cli_vmm() Date: Wed, 7 Jun 2023 00:31:22 +0200 Message-Id: <20230606223130.6132-7-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606223130.6132-1-dakr@redhat.com> References: <20230606223130.6132-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767994560093460957?= X-GMAIL-MSGID: =?utf-8?q?1767994560093460957?= Provide a getter function for the client's current vmm context. Since we'll add a new (u)vmm context for UMD bindings in subsequent commits, this will keep the code clean. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 9 +++++++++ drivers/gpu/drm/nouveau/nouveau_gem.c | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index c2ec91cc845d..7724fe63067d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -204,7 +204,7 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain, struct nouveau_drm *drm = cli->drm; struct nouveau_bo *nvbo; struct nvif_mmu *mmu = &cli->mmu; - struct nvif_vmm *vmm = cli->svm.cli ? &cli->svm.vmm : &cli->vmm.vmm; + struct nvif_vmm *vmm = &nouveau_cli_vmm(cli)->vmm; int i, pi = -1; if (!*size) { diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e648ecd0c1a0..1068abe41024 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -148,7 +148,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device, chan->device = device; chan->drm = drm; - chan->vmm = cli->svm.cli ? &cli->svm : &cli->vmm; + chan->vmm = nouveau_cli_vmm(cli); atomic_set(&chan->killed, 0); /* allocate memory for dma push buffer */ diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index b5de312a523f..81350e685b50 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -112,6 +112,15 @@ struct nouveau_cli_work { struct dma_fence_cb cb; }; +static inline struct nouveau_vmm * +nouveau_cli_vmm(struct nouveau_cli *cli) +{ + if (cli->svm.cli) + return &cli->svm; + + return &cli->vmm; +} + void nouveau_cli_work_queue(struct nouveau_cli *, struct dma_fence *, struct nouveau_cli_work *); diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index ab9062e50977..45ca4eb98f54 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -103,7 +103,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) struct nouveau_bo *nvbo = nouveau_gem_object(gem); struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct device *dev = drm->dev->dev; - struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm; + struct nouveau_vmm *vmm = nouveau_cli_vmm(cli); struct nouveau_vma *vma; int ret; @@ -180,7 +180,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) struct nouveau_bo *nvbo = nouveau_gem_object(gem); struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct device *dev = drm->dev->dev; - struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : & cli->vmm; + struct nouveau_vmm *vmm = nouveau_cli_vmm(cli); struct nouveau_vma *vma; int ret; @@ -269,7 +269,7 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem, { struct nouveau_cli *cli = nouveau_cli(file_priv); struct nouveau_bo *nvbo = nouveau_gem_object(gem); - struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm; + struct nouveau_vmm *vmm = nouveau_cli_vmm(cli); struct nouveau_vma *vma; if (is_power_of_2(nvbo->valid_domains))