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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0EB4C04FF9 for ; Tue, 16 Apr 2024 23:43:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E847112FC8; Tue, 16 Apr 2024 23:43:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.b="ZmkRdL0P"; dkim-atps=neutral Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id A38ED112F97 for ; Tue, 16 Apr 2024 23:43:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nlj7ZupnCFMA8YnKiz3ExwcZN0bnM3dACp/ggyeJOEDRJ7OJnR9K8JwQw7NIV09SgVFM7ZpeOykxVXlY6MuDxncLtOLTSC8UFGU1cLEptUrH6uOAx00xUo0Bskayy7iKB8USpnxGPQD5LrgOId+1/f7vUpENPH5AOOEqNBYGCE82StVygsFlpuc2lfrDRKAtKlLuZQXeFHpIUwUMmY3PcSLWUSMXxTwiuPUdsmAvfSH94ssCPGVrIZXo79p1FTM0pv7/YNdzrgan5vyBzgtvH0kD5xJeFTOnkdBcq5rogwyEB2cUqoIpaaEyzqg19IgS7FoVmuwYHn1tOc8tseeJpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Cfints2YZIb+yXS2Ew+iKD34NWUrSZvSsFUdR/IYtnU=; b=RbAsL5JHSg7XLNE0RftgmQ2xB3v4aHELi2seTuzYTzr17tAmrVZTBrwmNs05Zwdd0aFYjK4fjzs2gMctqiDYTa4l4K8ECmTsVvqq6H/kXoRcWC0L0BBFFj5CR/xH+AaQdvl/7AT3Bc1UNwGMlUcrLUGIgknKo6y4QNosBg3si0C73uTjoKSinGDIisk5vI9ixchheyhAmKJRsfnIexpLvoUYQTI9m4JyyQ+El1yrLQdlFLrNyNJAPCM8vprRBLl1tI/GwlErIbRLJHSf/dAl+YdaSSf5plkLyPUaEPTZRKs+lpok0e/wkE9uylTntwxhg83PdnZLNo658QbsKA2GeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Cfints2YZIb+yXS2Ew+iKD34NWUrSZvSsFUdR/IYtnU=; b=ZmkRdL0Phh71HuS308KV7v88mBPFfurK+tRbNFStZS/Fdvtez6dtiaylQ53LjU+xEzTDtjI4+6CZiko4vyky0A8KhTiQLQGRQp02Y6aPh3P06txENQ/WIAC6NT6JswiFxbWj6Mi4v758wC7oRG3/PYyJqQpmyRe2KokbJSF0sh67y+0WK4vvF+EnZwmjT0yW3ezkZwwvGxFD/aaLgL0y/xAypQuix6x0ZUET4bJl95twpHEgdi+gR7skcRYR2yomSbELy7rpCp6M1eFOqqeIBmruze6KMxA7OcQWKHUkTVI0W15+W4YwDrj3lHP1cvF88QxPrjUWNBU4cywa+B8ukw== Received: from DM6PR06CA0084.namprd06.prod.outlook.com (2603:10b6:5:336::17) by PH7PR12MB7017.namprd12.prod.outlook.com (2603:10b6:510:1b7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Tue, 16 Apr 2024 23:43:19 +0000 Received: from DS2PEPF0000343A.namprd02.prod.outlook.com (2603:10b6:5:336:cafe::97) by DM6PR06CA0084.outlook.office365.com (2603:10b6:5:336::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.20 via Frontend Transport; Tue, 16 Apr 2024 23:43:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Tue, 16 Apr 2024 23:43:18 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 16 Apr 2024 16:43:02 -0700 Received: from fedora.mshome.net (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 16 Apr 2024 16:43:01 -0700 From: Ben Skeggs To: CC: Ben Skeggs Subject: [PATCH 133/156] drm/nouveau/nvif: remove disp chans from object rb Date: Wed, 17 Apr 2024 09:39:39 +1000 Message-ID: <20240416234002.19509-134-bskeggs@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416234002.19509-1-bskeggs@nvidia.com> References: <20240416234002.19509-1-bskeggs@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343A:EE_|PH7PR12MB7017:EE_ X-MS-Office365-Filtering-Correlation-Id: 42c121c5-f6d9-42a2-6889-08dc5e6efe70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1toQS+qlkC0NXzwEwOMYEBlDDtfUkY9PaCJBmf+veWN7wEBRW323yOHUUM1tJNGi6VTcfu2If3c6w+SYEVZjy5e7m5yZ1QzrcKbL9Gc5UdngRY8qL6bhtgSLfIbccj141ue+h8EeLQZqdgdmxWgF9rT7b8clRlQVIvgokSXdbfHmG7bfS8b0toHxtIPpoFJqVgBB0+lL2f4YgZ/hm+x122dHTmGUMrlPlABm2btGrAkPTPaERXpiK/jiZZx64GTaRJSBwgVCfaPqEOD1Qyeg8H2H2lmlqEOnZS4C0a3jY5uhuEkMqwi2wIdfEdQlboZQPvs2wTxk19ggT6KLqvWj5bUoM+4d5piBvBYpXFUd0kEYvRKYGsx5Pf8eSqUk6gEFxSH6TVI8T5vE/GTVopQsOVk0AHplLFMHjL7uDd8TGr4L904jktoKy/mGOkl5FXsHBnVZmfFHHRHOVWlO4FhgrCiOKMzctk8yIMh4A6fBP9cEMP7Z2UJvPUWmnrhe31gHGSmkRKgpoqIrUx+V+xqfGoUXpGPCIXw+/DoUi0AjLtcSBx2AueNV2+li4ezSdCMFfeSkOr7N0/c5bF/EVB3h+Ucy3DUWIRKbcSRiMy98eEi36oZFcoJzZbVEUYPfnMbc8WBYeZTHSOaSZUEGCVnqegZggj1G8SiqQ+pxGYVcBXSoZdtLG+2N5ec/i9eR8YenUvpBZQbeEXGC+iHS/fF7yAtdY+8oQj0Vz28UwyQ5kErd1XT/dVC5nfvLsYLlhNxW X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(36860700004)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Apr 2024 23:43:18.5773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42c121c5-f6d9-42a2-6889-08dc5e6efe70 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7017 X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" - no more users Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 3 +- .../gpu/drm/nouveau/include/nvif/driverif.h | 4 +-- .../gpu/drm/nouveau/nvkm/engine/disp/udisp.c | 35 +++++++------------ 7 files changed, 20 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c index 875c013c39b0..1cf80535fcfa 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c +++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c @@ -318,8 +318,7 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format, goto done; ret = disp->impl->chan.base.new(disp->priv, head, wndw->wndw.push.mem.priv, - &wndw->wndw.impl, &wndw->wndw.priv, - nvif_handle(&wndw->wndw.object)); + &wndw->wndw.impl, &wndw->wndw.priv); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c index 4127bc05ea80..dae2b9e68ca7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c @@ -169,8 +169,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm, goto done; ret = disp->impl->chan.core.new(disp->priv, core->chan.push.mem.priv, - &core->chan.impl, &core->chan.priv, - nvif_handle(&core->chan.object)); + &core->chan.impl, &core->chan.priv); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c index 458c6f9e63f0..ab011c38b8fb 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c +++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c @@ -160,8 +160,7 @@ ovly507e_new_(const struct nv50_wndw_func *func, const u32 *format, goto done; ret = disp->impl->chan.ovly.new(disp->priv, wndw->id, wndw->wndw.push.mem.priv, - &wndw->wndw.impl, &wndw->wndw.priv, - nvif_handle(&wndw->wndw.object)); + &wndw->wndw.impl, &wndw->wndw.priv); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c index 2f4f0ad89b5e..34324b20ee0e 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c @@ -75,8 +75,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, goto done; ret = disp->impl->chan.wimm.new(disp->priv, wndw->id, wndw->wimm.push.mem.priv, - &wndw->wimm.impl, &wndw->wimm.priv, - nvif_handle(&wndw->wimm.object)); + &wndw->wimm.impl, &wndw->wimm.priv); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c index 17751110edae..c44ea1574863 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c @@ -364,8 +364,7 @@ wndwc37e_new_(const struct nv50_wndw_func *func, struct nouveau_drm *drm, goto done; ret = disp->impl->chan.wndw.new(disp->priv, wndw->id, wndw->wndw.push.mem.priv, - &wndw->wndw.impl, &wndw->wndw.priv, - nvif_handle(&wndw->wndw.object)); + &wndw->wndw.impl, &wndw->wndw.priv); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h b/drivers/gpu/drm/nouveau/include/nvif/driverif.h index 8ae50be82a02..6161a29fb07f 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h @@ -411,14 +411,14 @@ struct nvif_disp_impl { s32 oclass; int (*new)(struct nvif_disp_priv *, struct nvif_mem_priv *, const struct nvif_disp_chan_impl **, - struct nvif_disp_chan_priv **, u64 handle); + struct nvif_disp_chan_priv **); } core; struct nvif_disp_impl_dmac { s32 oclass; int (*new)(struct nvif_disp_priv *, u8 id, struct nvif_mem_priv *, const struct nvif_disp_chan_impl **, - struct nvif_disp_chan_priv **, u64 handle); + struct nvif_disp_chan_priv **); } base, ovly, wndw, wimm; struct nvif_disp_impl_pioc { diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c index bc15fe149a86..321b5b12515c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c @@ -30,8 +30,7 @@ static int nvkm_udisp_chan_new(struct nvif_disp_priv *udisp, const struct nvkm_disp_func_chan *func, u8 nr, u8 id, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_memory *memory = NULL; struct nvkm_object *object; @@ -48,9 +47,6 @@ nvkm_udisp_chan_new(struct nvif_disp_priv *udisp, const struct nvkm_disp_func_ch if (ret) return ret; - if (handle) - return nvkm_object_link_rb(udisp->object.client, &udisp->object, handle, object); - nvkm_object_link(&udisp->object, object); return 0; } @@ -62,7 +58,7 @@ nvkm_udisp_oimm_new(struct nvif_disp_priv *udisp, u8 id, struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.oimm, disp->head.nr, id, NULL, - pimpl, ppriv, 0); + pimpl, ppriv); } static int @@ -72,61 +68,56 @@ nvkm_udisp_curs_new(struct nvif_disp_priv *udisp, u8 id, struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.curs, disp->head.nr, id, NULL, - pimpl, ppriv, 0); + pimpl, ppriv); } static int nvkm_udisp_wimm_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.wimm, disp->wndw.nr, id, umem, - pimpl, ppriv, 0); + pimpl, ppriv); } static int nvkm_udisp_wndw_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.wndw, disp->wndw.nr, id, umem, - pimpl, ppriv, handle); + pimpl, ppriv); } static int nvkm_udisp_ovly_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.ovly, disp->head.nr, id, umem, - pimpl, ppriv, handle); + pimpl, ppriv); } static int nvkm_udisp_base_new(struct nvif_disp_priv *udisp, u8 id, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_disp *disp = udisp->disp; return nvkm_udisp_chan_new(udisp, &disp->func->user.base, disp->head.nr, id, umem, - pimpl, ppriv, handle); + pimpl, ppriv); } static int nvkm_udisp_core_new(struct nvif_disp_priv *udisp, struct nvif_mem_priv *umem, - const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv, - u64 handle) + const struct nvif_disp_chan_impl **pimpl, struct nvif_disp_chan_priv **ppriv) { struct nvkm_disp *disp = udisp->disp; - return nvkm_udisp_chan_new(udisp, &disp->func->user.core, 1, 0, umem, pimpl, ppriv, handle); + return nvkm_udisp_chan_new(udisp, &disp->func->user.core, 1, 0, umem, pimpl, ppriv); } static int -- 2.41.0