From patchwork Fri Aug 4 18:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 131336 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp77252vqr; Fri, 4 Aug 2023 13:13:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvNTSXVU3xJHfWGJ56tPrGE1XkgzfEQ2CShpKUrTQ+m2eBm+vLbVb6e/KfBv+pnet7ZCs5 X-Received: by 2002:aa7:d318:0:b0:522:ae79:3ee8 with SMTP id p24-20020aa7d318000000b00522ae793ee8mr2566957edq.5.1691180025136; Fri, 04 Aug 2023 13:13:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691180025; cv=none; d=google.com; s=arc-20160816; b=Fscon/uCG1K0LRCUDKLVj9Q3Qb/h34f8uM/6J9rh7nLUegK8HdOopUHyK5sxQpphSg dux8YqqMuh+QoOzZOEcOhGvioaHrpYDNsQfCNIGelCbQcjIwMR+nhm3tuPts8PkWczWU lSaDHRmm2xRQZxcvG2N3MCRx9y+e7LI27YrUGKunws6lnz2oWDMLZkHRuXLAiZKGe6Ln GO+3zcfWtQDpaJuS+D4QlS03M7Q5coZbda9vv0gIskxVLIABsivnYIIQ5Jrco/yUqzzM nyijRg5UWK+FexofxHMf1MZiIOCA/sBrWS/47hWMSMmJQ9SKVz3upBzf4x8tGWyl87z9 eqEA== 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=emComDzbbyqXVFHSmzoRBucD9FYG4LZk4alPAnUvQUs=; fh=K2z4qF9vBIeudG+FAsbdmtc7khu/mu2nGw/y5mnZTR0=; b=cJ3xQBVKo7TLtxpmOkEP8yo6MzbbtTVGWswtk4BLDlmivPWTdKj8HXyWuVWLtfaMvr zyWkC4id2J9zMmY7sbfUsC1SRQAdF0V7VijXB6ZAu8SZYwOUbOLIYONY0vks+NwwWAL6 qKEivJOTvYrf+rOVD3Rs817sHuk9gULtt0u8vMZZs59qH+IhHppcDYJR3Tx98zjEg7GQ pB5CUzXiWwjA0cfYoGWYAVURY9F5rEBS4eKRMyfjEdMKlYLsFNCDdGe3y7GlCbpdJgDV 8JGuY/K7ZM2nWU82ucLtx+nIXnIEpCsXXZLluybCr/NqxHxtxCQCJuQ4nThWxqI+pFlf ERsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Sakhc7Rr; 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 b23-20020aa7d497000000b005220ee1fe53si1124692edr.510.2023.08.04.13.13.21; Fri, 04 Aug 2023 13:13:45 -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=Sakhc7Rr; 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 S231408AbjHDS0W (ORCPT + 99 others); Fri, 4 Aug 2023 14:26:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230522AbjHDSZ3 (ORCPT ); Fri, 4 Aug 2023 14:25:29 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A80A04ECA for ; Fri, 4 Aug 2023 11:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691173472; 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=emComDzbbyqXVFHSmzoRBucD9FYG4LZk4alPAnUvQUs=; b=Sakhc7RrwzRyifUmNn3qeAMzIsF+pCbKBMMz3BcQ8Hd42YAy79WNgbEBiuqPWNmAlOqlCn HxnXpYiKrV0VE+iibSpZdzPyhbZqK2dusrQdaXbVkr89Bjb9IfsdQlPj1JUMToCUYyKv1q KM2oE5xWhirpb67mqckBsksDvlmBzkQ= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-392-s_NSbq2UPnOeiDvvsKNN_A-1; Fri, 04 Aug 2023 14:24:31 -0400 X-MC-Unique: s_NSbq2UPnOeiDvvsKNN_A-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-99388334de6so195880866b.0 for ; Fri, 04 Aug 2023 11:24:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691173470; x=1691778270; 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=emComDzbbyqXVFHSmzoRBucD9FYG4LZk4alPAnUvQUs=; b=kR/hwESgqUO10vKrMn8rL0tc3h6Jceg2WR6WPzGYCUypqRcoffPiD5/TDjEU4nB4NZ vzkb93dEG4jd773jpnMg9trSYa4spYmdYb0DYg83Ordyas75yfv2haYQh8SkHxUEj0U8 jkM8OuV93tmG4ZgAnz2qXTQH3R7Dr5BPx8erYF2i+j2qw4fsU3vhtfg8p1uP9BVMSt0l bLFdmS7/dN+F9rad5T8E3p+iwn6bYjaUVLy/WzwBqV137YWIaua1nugpd3PYalkGaNQH c6GimCbtCEka8+FsqAe+8Kg+l92uoLhJWFQlRvZYnws8PWKnU/vGkgc08zhsbIViZd/r /lMA== X-Gm-Message-State: AOJu0Yz9lOGXoZQU9IH5KvF9uz/UhXYmhU6q1IHzm0S5kl9mgvxW2peB 75u4ELoTcbMASwywy5NqtLTdfMVN7Lpah24C+YitaAU4kx9GnbLWpWtjztX4OjTl8qpwZrfRJyC Z82/fMYz0joybLYfdAihIq/xV X-Received: by 2002:a17:907:a058:b0:99b:bbe:e232 with SMTP id gz24-20020a170907a05800b0099b0bbee232mr1939551ejc.68.1691173470393; Fri, 04 Aug 2023 11:24:30 -0700 (PDT) X-Received: by 2002:a17:907:a058:b0:99b:bbe:e232 with SMTP id gz24-20020a170907a05800b0099b0bbee232mr1939529ejc.68.1691173469780; Fri, 04 Aug 2023 11:24:29 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id ch25-20020a170906c2d900b0098d2f703408sm1626455ejb.118.2023.08.04.11.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 11:24:29 -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, donald.robson@imgtec.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich , Dave Airlie Subject: [PATCH drm-misc-next v10 04/12] drm/nouveau: get vmm via nouveau_cli_vmm() Date: Fri, 4 Aug 2023 20:23:44 +0200 Message-ID: <20230804182406.5222-5-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230804182406.5222-1-dakr@redhat.com> References: <20230804182406.5222-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, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: INBOX X-GMAIL-THRID: 1773330785812279241 X-GMAIL-MSGID: 1773330785812279241 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. Reviewed-by: Dave Airlie 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 3dfbc374478e..6d639314250a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -149,7 +149,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))