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 026A0C6379F for ; Fri, 17 Feb 2023 13:48:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9966F6B0074; Fri, 17 Feb 2023 08:48:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 96C726B0078; Fri, 17 Feb 2023 08:48:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80E626B007B; Fri, 17 Feb 2023 08:48:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 73B716B0074 for ; Fri, 17 Feb 2023 08:48:37 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 50BE4C0623 for ; Fri, 17 Feb 2023 13:48:37 +0000 (UTC) X-FDA: 80476913874.07.82759AE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 423CC1C000A for ; Fri, 17 Feb 2023 13:48:35 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cxWsr1Tn; spf=pass (imf21.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.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=1676641715; 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=cfAnd4OS8K7FlDcC4KqE1N+eZSmvaMlTDnF99DGXOtY=; b=TNKZaRLngNamPsIixcG47y7aPPxvWJ97XJCrzy6HzXBPdUcPcd4a7CaOqT1qSBNOoonFw0 q3Xos4Aom1YmiMZQejg9WIKk6seAH3AszOUU0zrl/xhrqOUnaKRpD6PqZzoGoiM9KxBxhL ZbxIsnSTOc7ExPovHZadAdUvj8kQyFg= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cxWsr1Tn; spf=pass (imf21.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.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=1676641715; a=rsa-sha256; cv=none; b=dXy6WRLJPJ9RDPJfDpD3+CspS3cib1JwH55/e/W7rGcSOSqGi/kbt5P8fbv1QEnBSFemGG fHLejrw4IK/jDnCdM+dWriFX4Hvb5KigM8JHtcHc61ndHqnp+WC1QJUyNqB8ZDGKs+Ul7r aWmVSE++OIoEMa9+7oCQHXnr4hOtVOA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676641714; 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=cfAnd4OS8K7FlDcC4KqE1N+eZSmvaMlTDnF99DGXOtY=; b=cxWsr1TnZBkLIsbVYJGAD6K5VFKD4mmTNLm2LdLOnhgqFQca01vblbbzBuEOsWUTWiUzgi s/in2PpmwmC0IboPCzAKk7QjhbUZyFY182fj/VuqJzcEGeLdXjQojfLIxIYbbaqbQIWynA 2sCNDIvkMvgVlkpi5926UEtUnIblir0= 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_128_GCM_SHA256) id us-mta-673-vk-XnnP4NcaMMCzfnZoc6g-1; Fri, 17 Feb 2023 08:48:33 -0500 X-MC-Unique: vk-XnnP4NcaMMCzfnZoc6g-1 Received: by mail-ed1-f71.google.com with SMTP id m28-20020a50999c000000b004a245f58006so2161929edb.12 for ; Fri, 17 Feb 2023 05:48:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=cfAnd4OS8K7FlDcC4KqE1N+eZSmvaMlTDnF99DGXOtY=; b=0guNwznD/MmX44GHN4xv/0tmKgVt0aWepVd3/31eVQxPbshxDxP60vdTIRL7JOeXNx WFeQAKMphKpA2XK73op5+5B+D7QHfmMm3Fk6RKzdEPMkLue4DwzqAmwtSxPrYnhrWI0g ZwFtPZXzgzCWMeX194xhe0p0zTusNlMgdQUykL5n+XdbKzFtxUL+cnk0HkppjXmxLz5G gX081Gpx+yW3bOoDE8mUsFp7Br9sbhy9LZA8bmBjkTo9K+D6UHpFLCsYUIUQqNVoMn+1 OwSYSWZfVKUjFKbk60SapCL5OX908DmQuowFT4hVSjwx3j2qvbfhpW/oLzyifvFVr7Fq gd5A== X-Gm-Message-State: AO0yUKWWIH8lt5bRE622fwjbozN/CynZmbq4FxlheXwjw8hBiX71XevN GUxx3fh4lu12ErgAGZYvJixFaYGcB3/t9ArsIaOGZdiMCeJ5wVCggLrBbJkoF5dgZ8gXM2J4IQO cRjY67IkGyFM= X-Received: by 2002:a17:907:212d:b0:882:2027:c8e2 with SMTP id qo13-20020a170907212d00b008822027c8e2mr103444ejb.56.1676641712434; Fri, 17 Feb 2023 05:48:32 -0800 (PST) X-Google-Smtp-Source: AK7set9pimoemSkJ2kQZQvRKaPf0MC6QFTSypVsludSNFNxOV7/3olSpQeL9Z0Z58W/+NW3BXT3ovA== X-Received: by 2002:a17:907:212d:b0:882:2027:c8e2 with SMTP id qo13-20020a170907212d00b008822027c8e2mr103423ejb.56.1676641712215; Fri, 17 Feb 2023 05:48:32 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id qn20-20020a170907211400b007a9c3831409sm2145357ejb.137.2023.02.17.05.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 05:48:31 -0800 (PST) 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 v2 08/16] drm/nouveau: get vmm via nouveau_cli_vmm() Date: Fri, 17 Feb 2023 14:48:12 +0100 Message-Id: <20230217134820.14672-3-dakr@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217134422.14116-1-dakr@redhat.com> References: <20230217134422.14116-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: rspam03 X-Stat-Signature: qcta6yemhwi9srgw3hzkb3ctub9m95a3 X-Rspamd-Queue-Id: 423CC1C000A X-HE-Tag: 1676641715-275236 X-HE-Meta: U2FsdGVkX1/QYErbdMujw+aOuzH+1L70fTNHS69jMs5RrSyaCIOSFeB80exIzePt3qLLOrhd7JVOP0Y2tx88rN15mOMwcsfsyc4+baNTgbXqCS4l+rNLd20f0DCzB/beGnhJhc2zSd5bHflSuBBsr/G3ikxfdwtqUwMrrHzjZX/ZS6Gp0XZsvKIOKp7lK1+1t74zYh7Uf3mGIH6XtoYqBZjCw+B5fE0Ezexy3PhxxGS2UIfqMqTP3yeT1qS/qpEPal/Vpcd0L5aQp8iC1r5X/LwW8rr5/XcJ/OaBQ44Een1TzvO7MJdzvCOjUAmD+tWDKkuFJ3pEl3R6uDAHa5NTPA1M+cnIm2jXpxMr8aAs+65Cn4mZ3U4SXuEXosBwwCLWcFvdZGdUVFRTfTSC2s/GkuCQT+vkjchyXdNmP/o9RSOSDlBnpEycx+CUpPuyQL6z201UME0+NFg2cbnjWIE/+I59Rsj47Pd11XbkWAUK7K7QwPg+I58y6RRvw9ICzybsVVJ9FMJcrSY41eyFtNC+Eder/yID1jN4tg06N4N/BbUBlEClfiTCtVmFJPPoUVPubWKf3+rICK4//yeLlwh9CazPNy/VXyEVxQp53HUrzuF4243fSpFEmyDrQyn/aTAYglzGbjXsDFiKydEVHk8MVB8EMPIKSoAxz9h/VMGhI8IBdd4fvskZ+qF05WhyFVzZeUv+hcbutaJ2gPujepQ766hVkafOBSHvVQMileI7yXkCdJjh2vN6gui7/7NE1MJL945pxBzVvX7z9p75CloaYkKYH/U6r1aslmbj4B8WR1+CKEW//4fyosfm1nRhaIgPLCvHzgL+v4i3ltTNWLqnAGv35QUJUwIrY1rHlN8bpLDVkbfLI6AWKMd/hBSNdMSE0IkahO0mYf1u5BwffI4jkE+8YsptueHtM7/KRM4afpx0FDinFuDXZTmU+JlJlNdckIWTXINoafFc72oCWeW uwNRbK+u YCkLlgbWufzQAmFqcyu4YbG5CyKZ+GjZGLRZw9ECapVplos87pc2KFK/ehdyBKF13npXBoNXbp2BlLBttpBv1QAdrJQ//tBoUbxq2RopCY+OYN3hfCLGDFqA4NO+pdMeuQflHk0+5gvXzWURlORZRkgf7KuYTDctdG5zsM+K8O/KizGfCgehMxOwAJNfaoGl25xwOeaBfDUEMclTqS7r76jfU+47FwxEsYHo2NAZj/OiCB41ro0n/rq6brq29tQXzqvU/fkJ4IKAsVIAqU/+QUffm8tn8hfH6VHB/30y6IaVcocEOErZws+1+yE/3d+3ecMVdW4Ymc+HsEMjT7qDa9SFM+iFJROBB1X0IXiFnf93RiB1EjQPbyrLlCg6zX52MUjiemdCEGzy4JYISTvrfRDv3B+ngJHve5zYnBGd7Aw09L22WZ33u3HfJWw== 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 288eebc70a67..f3039c1f87c9 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.1