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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8FA2C77B62 for ; Tue, 4 Apr 2023 01:28:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47603900004; Mon, 3 Apr 2023 21:28:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4263B900002; Mon, 3 Apr 2023 21:28:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29F8E900004; Mon, 3 Apr 2023 21:28:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1903B900002 for ; Mon, 3 Apr 2023 21:28:19 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DB254806A6 for ; Tue, 4 Apr 2023 01:28:18 +0000 (UTC) X-FDA: 80641973076.14.6926B81 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id D300F180003 for ; Tue, 4 Apr 2023 01:28:16 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EtRji2v9; spf=pass (imf06.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680571696; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=C41um5yLWIzQt7F7rKhcCeybPcAXgIiNcRs8QRFgiIk=; b=dfD/ni005N5o9L3b/z3p+g/9DBA9pdWaZRI/jjm9/xKhEMbC1xzG28xzsPTpvBFkHy96Lw T1IvFKf/I7ywPuMp2VdtNfoDrkG145DYhPM3KhD5gWhzEPvc6jhvsItgcvUdVz+y82eO6Q E55/Depj8EPodyzcHh20MsQkUoZDybQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EtRji2v9; spf=pass (imf06.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680571696; a=rsa-sha256; cv=none; b=0MoJx3hJjXInaCJEL/AgH0dGS4JnXvpjAIpng48EaStnpaJzJTi1OyfNxMA53Fku9dMonw xQJWPnP1LkKYj8qQzFFimVlJgJZ6C1RnHd3X1koWiPrtSZAGquGnDzA3mzODWKLIFdGotE FOLCNkudEzrm/1UVef7QM1zz9evAJVU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680571696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C41um5yLWIzQt7F7rKhcCeybPcAXgIiNcRs8QRFgiIk=; b=EtRji2v9ENDx98oIdRF8w2JkrBAsAEGSkM4jGAPybL8CEOqiYrdcQ0LWhQ2+hvbGtcC6oD c/yNwAbdAiGs/tac7h4Lqi7UoETN9kgYtmWH5TKgxqHdZgVFqMrx0x01KW9kcSqpCPjSmB yU0JP1aRXurbl63IUTJ8eo3Hu2bSXZk= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-424-xSGyESRjPiWF3F6kufI53w-1; Mon, 03 Apr 2023 21:28:14 -0400 X-MC-Unique: xSGyESRjPiWF3F6kufI53w-1 Received: by mail-ed1-f69.google.com with SMTP id v1-20020a50d581000000b0050291cda08aso10029278edi.15 for ; Mon, 03 Apr 2023 18:28:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680571693; 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=C41um5yLWIzQt7F7rKhcCeybPcAXgIiNcRs8QRFgiIk=; b=HF1a87GBum+xzkq4cFN50mHeakQBL4ackHS8iUZKxqrBTYJSTOgAX3BFdTnEwz1H1f cpvh3BLNMIhue5waWLsxEKMCMlheBQ1QiQgdnwKwiSbyP9OHLcnxdNMQQHh2hjacGFmy 6Bje9PCYhdIZob3Hbxd0pP9wcmXY3bTt4WbyBscDs2rbirBLlqOfvJ5DCUcF8q8pLThZ EISn44CDP3SfqpisTEKY/bQqtYVxC96qyGU3tYssB7QESRbEBj7zsvqc87jIby8KT9Z2 KVbUNr0F9+CKSXQ2Fi39TSV34ReOUQ1i5GCogy+/IAKa83+vpU8tOf2pLmY+colFD5Xt C8TQ== X-Gm-Message-State: AAQBX9faAAE4gqzcWPDx3/bYW+U19SvG4ShdactZQcvLtagYgYBkp22a WEPI8HydA1jilA3vqQlAWbfppC5xxuIG4FzmCXEIz/T73xphLoO3sZZRnadG9c7SPuFeB2h8utR idmlqTx5SL3k= X-Received: by 2002:aa7:c90e:0:b0:4fa:aee8:235f with SMTP id b14-20020aa7c90e000000b004faaee8235fmr943429edt.9.1680571693569; Mon, 03 Apr 2023 18:28:13 -0700 (PDT) X-Google-Smtp-Source: AKy350YD1apOrfFR1SXewT9++SPNKJl4XOwsiekHbJJ2vEXGLOhHo4lvex5XoRNLN4t1CXPNbaeEDw== X-Received: by 2002:aa7:c90e:0:b0:4fa:aee8:235f with SMTP id b14-20020aa7c90e000000b004faaee8235fmr943422edt.9.1680571693408; Mon, 03 Apr 2023 18:28:13 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id cq5-20020a056402220500b005023ddb37eesm5156889edb.8.2023.04.03.18.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 18:28:13 -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 v3 07/15] drm/nouveau: get vmm via nouveau_cli_vmm() Date: Tue, 4 Apr 2023 03:27:33 +0200 Message-Id: <20230404012741.116502-8-dakr@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404012741.116502-1-dakr@redhat.com> References: <20230404012741.116502-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D300F180003 X-Stat-Signature: 7hj8kuh1nosu7c37usc59bk9y44gw5bj X-HE-Tag: 1680571696-957020 X-HE-Meta: U2FsdGVkX18SpDpubHmd65CiC84Bx90+3qaHuSJRNa75CQ6g7tjXJBUd8WCwVG5SHE5Gcqryno+1wWujWtuks+xsyOSirNzTiks4ONRh3EhgNC14BPGrFMOqGPCf7tq7yGOLxCsIvnBROWG3HfjxYJ0BTrRdJk9yUSInPsx4PVa0eHuanhcGqdJJtfUOC0gPOCZQWdA9Fcom4MurT3f7ug4F547xqKzD6yzQlXrkyXjfVLszekhjjGT9kMCLp4vJlB8dc+BW2S0lhS9VB3zPtD+0XeXricr6ScvzifnZIY0jwIkQ9KRMAlCUFn13z5m5Cr0axz4Vwjz3cERRlfSffYW7MAWNouyZa/paxdSatZMa847qpAJKvC7vkmij0wJIZNBrxZPurE5OzqfwTjrulz17SUXuKj2MZ+vz8SriCpAAa7MCaJVDWBlzQ3lTNLdbGBEaV1uCjcF7kpGDTOmcSktO/fm90OKCOSgpfrjCUx8Ico7J/S4etiYqtP4bwMJ90BA+sbEPL6xREKInFI6zk+3D0tRlzDlPg/oFExo6JQ5VWY/7Sd71UE0qrUxlGzd7g88+nAFmcHWF74701yI8K9yA7auu01Gn3otQZzBoDwsrMYbwnCoGQpCG1AF7YejpS81oJrUhCzMOJVNVLFeebedjZ8AmIsPO/VLQ6hhf1mybHCSUpbX+pmDKbhhyt5dPT9YKG8PFOwXlWKQrO8lfvjRcC37bOj58YGFEbgNvRsBoJC6TVOd4bazMUpCL0N9fggXJYLjQFGzEJNi6bIFhJ+RpRjqAS1ks7gan81NeoNVt37tdHM4HXFOB3RivoKiDVnb5yV2Lwe/4BqXejio4LlaMtO5qIIL7cDkyz5xvvxOnIo4hp9kHP7k1dxG7pl4Mq9nQbbHnSYmRfW70HQE12HnLCtvye/0XR6gg5Fjbs8eogdHKcuzUMmlKfGaUtMJpHP8g8Hug5AQDe/WsBCM A7WK6hIm sIED158Cd2xOim/ldYSEZyHc8NFQZFK5SWGDY9v2Y2+itT5ya+GX4qa+qKoBKkS0Fm8QzHaM5Vd29MRRSjf/nMTFDHnjwIZ1JgbnfwpGiMa3x7S8flOIP8S5Dya8JG+5aPoCZhkiJqbGlrcnZXKiVq2Fe18GUzeal7+539t5rvA2gqG7WYFybvAtxAgzLZ3Yv3wVkM4HQ+BCviFYY3EBdrhkBxcUXgf5oOyErjGLtlfvkVW3nf6jffeZqV8mjdIjXPkggc2zoa/IgyjD4zeu9KJd1oeUsdWO/nGm6x4VcO+aPlhH4pyqjO/hsMa2MPGmO9Z+8R/mRgDJFE/yxk/OdNKCbzqsi/aXk26CsYyioeLVCyIzK8faLVBE8mbqYJgDBEB8RTRZsG5mhU8OwWnwQ3znTyHUv91KYs0H0hX1QF0rA1Z6zJwVtHkNtDiiz/bSHbRK9qYt+vUjH1dM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 f77e44958037..08689ced4f6a 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)) -- 2.39.2