From patchwork Thu Jun 29 22:25:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 114467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9953012vqr; Thu, 29 Jun 2023 15:30:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHVsV58/b9ok+ymx7GVvkCStx+UL0D17dsL6sQ26x4xOhGwMF+zjwTYbKdQypdKXfF4H9F X-Received: by 2002:a17:90a:764f:b0:25b:88bc:bb6b with SMTP id s15-20020a17090a764f00b0025b88bcbb6bmr857744pjl.2.1688077835983; Thu, 29 Jun 2023 15:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688077835; cv=none; d=google.com; s=arc-20160816; b=aopTtOxIU4BL1+iQ/dm+rxB8sdOpe7LxxmvGH8k3YzY/AwiDFNpm3t17PJRXWTdIn8 sQi9KnRPdRv9/5w4Xt5NUX457akgSRu5zpFgo6exfoq/+9kDEpVVZua6eldV+rZECSey 7j64mUDyhN/pQk0ZHSTDzCX+iJgcs/71q+rlhurYjIqEWoV8zNTpl2ih3n+6d7WeOy4i zHyOfznkDAMtkYfH5/JrIOIPd8VcT1GkQNxBimnL1YsodygV4d4JtOf2ZEghYM4qUZwG k7yK2RjGaetWE7aTJA16PW1vjpfV6cCq+I3iyE7me3lq0d938KvpyfG0wtHpdsD/vP8I DsAA== 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=DNvPFmPephzOlef4HOM2AR90BUKB3CUNAq245FGhm7Y=; fh=oJWNLif5KU//MMAojej1FrucSdQl6qHWc24CaRte2H4=; b=GVJDCJno8fRtcsCBUFUWGlvEFkdbkkBoXUQEtu3E3trDeUGBx+X2q9nDKhMsVLyNqC rETchnxhRttncabkH0Yu6PwTqEF4Kr2jY0PpokprLaYVp1tQCG/04ZQGXWIQAub5r+k5 3V6YyXiynKSin3ezl26U43kD+grUoRzqXlq7+T/CfJvOpiasfqYKKJmaGWCDyEUwBIgC 1CTViTja6bva2FtQNOzFWulv/Eg/RRfW9fDrH1mTh4kmjV629KSx/xqxAfd/BWaWNkXj 4IAYHmWj2sWVVaxHiQZmnxfK1Q9kmx4VDOpMpM6r+ho7NKIdggIQqCx0sbAr+lTO/QUa e3Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VyummQZq; 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 b19-20020a17090a489300b0025546028cbesi11056393pjh.31.2023.06.29.15.30.16; Thu, 29 Jun 2023 15:30:35 -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=VyummQZq; 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 S232096AbjF2W3G (ORCPT + 99 others); Thu, 29 Jun 2023 18:29:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232190AbjF2W2m (ORCPT ); Thu, 29 Jun 2023 18:28:42 -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 9B5AA3596 for ; Thu, 29 Jun 2023 15:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688077643; 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=DNvPFmPephzOlef4HOM2AR90BUKB3CUNAq245FGhm7Y=; b=VyummQZqz+Q4Rv/1Vj+a1XQyToj+bcGdi+EzUe/vzodUdlO3S71aUddh6T5lzpah//dnfl BiqZSy3sfR4zVqiDr3u99T0ZRJAP5n/zuvMHnRetTGmReSx0Tt9p33wxyuKsZTpwwqRP/1 fXdv4Oig2J6SiLLZNMk8OsSQlXWdJ0k= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-325-zdz7UE87NdKMhByWZ7j67g-1; Thu, 29 Jun 2023 18:27:21 -0400 X-MC-Unique: zdz7UE87NdKMhByWZ7j67g-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-313e6020882so505044f8f.1 for ; Thu, 29 Jun 2023 15:27:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688077640; x=1690669640; 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=DNvPFmPephzOlef4HOM2AR90BUKB3CUNAq245FGhm7Y=; b=kmrlue4bsO9L7issybKhjt0+QOaRhmRQ9gDhDYV3qXmQUux9URQj/O57PD6ygGFzRt M0zGA2ez4X24z+RR3K9Zzz2877a3LXBRzcankCSm2EUgN5lG7igkqElr1Qx94bm2SNoZ jwBa409qii8ZnFtSluLBBGY6dmiRhf+0b1OoUg1MEMk02GmSWJFJun66rJJUWNdwnPnX IJuZDLjGSkrh53hp2wcqqrHaZObpsgvhkO03BL/nMDAVnDSaOYwHrRTpSRJttCul/ONs DN0DFyb6DsQ0ggxHGuJWLAKX9lNtannI49lwDPluXGuNyLVrIwcDFfEogYOcaIJYg6v9 fMqQ== X-Gm-Message-State: ABy/qLbEx85S1xn8wj1KWRPTVj4TR1NIT1tUGcVl4k9UqP1SugwYZ38B UQP/LNji3XW9f9/hLTw3UhHSGgHWAo25wg6uLpm02BpZqIXlANSP7nTpvVV7apr3V0BG5O5d+OE 5SFgc/RVfzXhBWbKOfv5rcwks X-Received: by 2002:adf:f84a:0:b0:314:140a:e629 with SMTP id d10-20020adff84a000000b00314140ae629mr3559375wrq.7.1688077640122; Thu, 29 Jun 2023 15:27:20 -0700 (PDT) X-Received: by 2002:adf:f84a:0:b0:314:140a:e629 with SMTP id d10-20020adff84a000000b00314140ae629mr3559357wrq.7.1688077639880; Thu, 29 Jun 2023 15:27:19 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id u12-20020adfdd4c000000b0030903d44dbcsm16876347wrm.33.2023.06.29.15.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 15:27:19 -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-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v6 05/13] drm/nouveau: get vmm via nouveau_cli_vmm() Date: Fri, 30 Jun 2023 00:25:21 +0200 Message-ID: <20230629222651.3196-6-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230629222651.3196-1-dakr@redhat.com> References: <20230629222651.3196-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_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770077904954869111?= X-GMAIL-MSGID: =?utf-8?q?1770077904954869111?= 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))