From patchwork Tue Jan 30 16:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537778 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 112D3C47DA9 for ; Tue, 30 Jan 2024 17:02:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B267010F91C; Tue, 30 Jan 2024 17:02:54 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2058.outbound.protection.outlook.com [40.107.223.58]) by gabe.freedesktop.org (Postfix) with ESMTPS id 172C2112DE6; Tue, 30 Jan 2024 17:02:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dj8Z39f5uxMcK/cS7eQh5VyPCj60AOlq5/xddmLeOcmMSZw4+x0fgwDxnnE3CxaLKtALgbPZg7ZlrlJrYTgA07Iix4dUxQkR0KSDqsgiasIAz3OEbuODU6MtVeHnQg3qNdttdoXveSY8hNIbkCKqGKYZ/yfKntm6WST/dNoXuvLnDfeIiDPz+PVcCMRBMPmHyiU3Rq/mf9glcih5aWNO9v9g81LSFNkTCO8HDzq9jpheNMfZ6KqHlRPAKjjXYr5qI2Fi4A9d57OiPBHtRLmdSi/UVACRKWDr161s0hSouN0kGFFmdH+80MQQUUFE2BUpSzii//NZ5tb8Zz5TDiA7XA== 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=1yPE90Bv8Eo1imS8RopD4ZNhb1mToayZ/qz8hC8zZLk=; b=fS0lVY5++bw2xuUNSmDDzQAWN8+uLlCAlGOFm3JVCbV8zeMcVWV9EgQwsGVF9Tq5QTkkpqkkeNLp7c0HRfvpxw+fsCVmNMr+AS/H7DDBpEuNPkHO5anrOSJk+faax7H9Dj5h13JoIEpp0y5FkogW9TNyIUI1X/5WDe8j+Gu/kbG4564c7vVDB+MmVWfoPLEKNbX0LuFqltIV2+20fIhyhGQM4aqwmW9TGdwjutGjIWyAweb+JkXJA1W9r1yXekbqkAowZlS95ZbgzjKuv9Dx9573pDkzz5p1zb4V44eIx/UDKCB0sW3FzPN0UEsHYQ61raarUY4tVm770dlN93qLAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1yPE90Bv8Eo1imS8RopD4ZNhb1mToayZ/qz8hC8zZLk=; b=IXwsei964OPcrb/T7R8iGIK3M+w2CJAMZPWFgF2b7Uxx6yKZHGF9ZxOqFaC7aw6kRlLi7I8owDgQZDBgkqVoOh0kQ9BI+xBXRknC/z6eBucSjX8sTCUxIQaN+OsPtjEd6ua2EypCNjuiYkFj5BQTHSjd71exdkAxdP+K12hyhVs= Received: from CH0PR03CA0331.namprd03.prod.outlook.com (2603:10b6:610:11a::22) by LV8PR12MB9418.namprd12.prod.outlook.com (2603:10b6:408:202::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 16:13:27 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::92) by CH0PR03CA0331.outlook.office365.com (2603:10b6:610:11a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34 via Frontend Transport; Tue, 30 Jan 2024 16:13:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:13:27 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:25 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 1/6] Documentation/gpu: Update documentation on drm-shared-* Date: Tue, 30 Jan 2024 11:12:30 -0500 Message-ID: <20240130161235.3237122-2-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|LV8PR12MB9418:EE_ X-MS-Office365-Filtering-Correlation-Id: 66be9625-606e-4246-9bfa-08dc21ae6462 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dq3JKnQBZLfQ6sWdf052XLQI7fjjfYWayiMFHcgUYFZkqQuIEGg0Mu7x17nNcyOrZGzSPLrrd4Tiphb54Fb3xss/NBJfPPYsnylmku9vnSXOrlkpdSRwAPQKPGLzPets1/zlCBngLBcJXze+Uf8x6RNSP92Wn8gU0yRwtij5jeLBs/1UK8H6KBaobuch/I7CRfn9/xD5hfxaSUfCSNMGU8fhhPmZzDAY1VBVpIZWoVC5rcRq9E4Qw1EyzyPQGU0Avw3AvyHVTZEAmxfRDbsDCDFyqEawfcoDNbiAhgRZDw4RqitK64K0G7JF9RY+S5rnycybi4L/TBFZDa5CeWjIATuxcttmIkLZ56taA+iyI2KrqqUDVc9Pi+vCJrY5X+mLZSdArNA0IQ+1akBMQJPmHY0TrZC2qP0aMoNCkZ1mpL+9B438Vz0J8dRJzut3sOlEEZMNutj0bEYglrvx+EpoBabn292jTEhRV8o+kXAWGjlRrWlBTHRPktHX6etaKNNLopIFVEVKgUJrlaAm5oxfJvlbNcTiPDDVBXwDLheVS6U8znueKaWYvFJmgwPcWLjTh77gkJyFGVMEszw2zNmI9g9gny82h+nF61cf8LGQ63Vzyinv4ox3LGKAfjjYgz+UaSwCyEEQpwhdtHanUKBpl1XRFueMSlzsCUdsNm9M2ULJtYEUT3dk2HB+8t7q0WBxxHoYgGTf7sEAaJrMkZElxPcwGiQ4+XNsPkt63VBYBVMeFd/jNrD5CF4Iy1AaX6wTxvkyrRNHnPsS0Ke9dke7tg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(396003)(136003)(376002)(230922051799003)(82310400011)(1800799012)(186009)(64100799003)(451199024)(46966006)(36840700001)(40470700004)(40480700001)(40460700003)(16526019)(426003)(6666004)(7696005)(336012)(1076003)(83380400001)(36756003)(86362001)(82740400003)(26005)(356005)(41300700001)(4744005)(5660300002)(4326008)(36860700001)(15650500001)(478600001)(2616005)(316002)(47076005)(8936002)(110136005)(70206006)(2906002)(81166007)(966005)(8676002)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:13:27.1196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66be9625-606e-4246-9bfa-08dc21ae6462 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9418 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clarify the documentaiton in preparation for updated helpers which check the handle count as well as whether a dma-buf has been attached. Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Signed-off-by: Alex Deucher Reviewed-by: Tvrtko Ursulin --- Documentation/gpu/drm-usage-stats.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst index 7aca5c7a7b1d..6dc299343b48 100644 --- a/Documentation/gpu/drm-usage-stats.rst +++ b/Documentation/gpu/drm-usage-stats.rst @@ -138,7 +138,7 @@ indicating kibi- or mebi-bytes. - drm-shared-: [KiB|MiB] -The total size of buffers that are shared with another file (ie. have more +The total size of buffers that are shared with another file (e.g., have more than a single handle). - drm-total-: [KiB|MiB] From patchwork Tue Jan 30 16:12:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537779 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 DD623C48285 for ; Tue, 30 Jan 2024 17:03:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 28FF6113223; Tue, 30 Jan 2024 17:03:11 +0000 (UTC) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2049.outbound.protection.outlook.com [40.107.95.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 364161131CD; Tue, 30 Jan 2024 17:03:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D4Socgwh6xWUreUYINpG/J3KOLUSkFYyJPm+BrcQZJaDgQpyngPkEjeGOQStMtB2OWYEr4RpjtYhRnAvt3Nsu2+DOU0l4DKIMTTC7l6438fcpQDQbCxe6jJvodypZXLI6Y7jokseYSxVkrwmUZz0UuibPOr4Etfff2NV0NO6PirqKTIzaW2oNP3kd5wDcbixUDr/fcA7WpHABjnOMInVT8bREFzilZjSRYgpnGw0tzLCnlrmy/Z0Ljnoat/QOhWktgXSbS8HvDb+QPnVw7DkSdv3Je1hIung/dNVo4kju9sNQmHCpe+IPZxwJWCz1/FQj/Bw78EqfQtLH11O69969w== 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=DY8aq4NpcJw/Ci//xgfd8DHDI0Bok1t9eLh2qxrsn74=; b=mypGHkT5wNGIOpi07sTXc7+ifeCVgYdtqcVVik43mxlRzqiHE+V+enCi9zZLaBiFJy0qQSkkF7vBLtPi55loaiAJMspogIta68x6d+SL/w4eH0cctFmNF0Mu6cZstr0MupjZjSaGbgPhZNZTvQUlYs8d3qbqoAS0CvgHPCPpDGELc+pKaCdOEJNC+hdJ/2gpejnXPcXG16lTZf9lQ8ErNnamHxGUa4hJoge1TeoncXFKnPXiMC/BngaQVbz/K8C1ImM0M88YaKvegyg7jU1FvVPNYio8WBgolJIkJ8+f5b4NM5Vk1YV9B2uBtjgvr3Ocew2iGRu1cwibfnBuBGkIPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DY8aq4NpcJw/Ci//xgfd8DHDI0Bok1t9eLh2qxrsn74=; b=YNTRl7mk6BfyCWS1Bea5YPVCZqPaRLzrWNP2E4zL0eDVe/3hxGAFmu8JnYbuw838TyyRmv6zaR4eFPgAOIa+3WvBXekEe93ec+3XhO1nYgONkOXh48PGlK+OKyKWhUmS2pamzMz8VWGJfXms73fUT91XMMn5rt5r2JU2l5ikkAY= Received: from CH0PR03CA0337.namprd03.prod.outlook.com (2603:10b6:610:11a::27) by MW4PR12MB5602.namprd12.prod.outlook.com (2603:10b6:303:169::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Tue, 30 Jan 2024 16:13:28 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::e5) by CH0PR03CA0337.outlook.office365.com (2603:10b6:610:11a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Tue, 30 Jan 2024 16:13:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:13:27 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:26 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 2/6] drm: add drm_gem_object_is_shared_for_memory_stats() helper Date: Tue, 30 Jan 2024 11:12:31 -0500 Message-ID: <20240130161235.3237122-3-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|MW4PR12MB5602:EE_ X-MS-Office365-Filtering-Correlation-Id: e980d82c-14de-4084-e5b4-08dc21ae64cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 62C4E/hL98yOUFiw4FLBUAQKygv0NgXxg3C/cJZW37bwK3efW+LH+RJqjY6giS/uscCEv9fmL5i8YOq8x2zQzJrEGTRgbVUC9WvVuHvYhi3hktagdkROzvJisOehkI1oBbhXdFjRgKxhXvmNcnYvs8XtAv4xW5lPcS7CdIr6436RaKV4bM2c00Oh72WZvr2MPyTyRE5vPy6mSCKtjERE33JQ9nafavv5jwYNerkGqam8estpdMIHeuA5HT1u/HvCfsjy/8AUk63vmsmK+Rv+6Gk2Mb74atV8rh9s/HKVoWwgZMNC5H2Ag93lo3Om75auOXIbbJK4aTNhqmXgOvzZOjQ0yYueKoZu5vgr0DTK6pWDCC0mQGXc2w/0bSWQzhvpTrLyLXQa1EJlYuRNV0GPVtwRIdJ0NpTN6lWT1KpI37FpNi5f5CcQFRa6qXssTq8+pvTfbmwgiyf2Fh+TycuJ1U/1MEIXxANbMaLHuv8QZf4QU0LROt+u2ksXv/+dMytzhuQ4isjM5JGyAt4qWgqdQD3F4VBQsVzypR3dYstvA6ZdotdVo+VJGbu7v601J5mlK+XPxg3ecAjMHuaGnvUJ0IpPd+mUSf7KUcNnKlgl82YLvfJTzzPUaRuYMUCJ9NpbDmaASNkxsJQpViCaUfPcLaFRJbpuigU2849J5nEFRjBseIuudH0P6/+biV/0xlQCZfRuok4UI6IPJ2j11tSV4PhebxHV8nTAWewKqYc+fvQ6kGSKV3Btaw/Qm+K1Kk16h1Ons9ppRsE6Gn2kaMSytg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(136003)(39860400002)(346002)(230922051799003)(451199024)(1800799012)(82310400011)(186009)(64100799003)(40470700004)(36840700001)(46966006)(83380400001)(16526019)(426003)(1076003)(6666004)(7696005)(336012)(478600001)(36860700001)(8936002)(47076005)(316002)(2616005)(41300700001)(5660300002)(4326008)(81166007)(2906002)(8676002)(70586007)(966005)(110136005)(70206006)(82740400003)(36756003)(86362001)(356005)(26005)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:13:27.8228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e980d82c-14de-4084-e5b4-08dc21ae64cd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5602 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add a helper so that drm drivers can consistently report shared status via the fdinfo shared memory stats interface. In addition to handle count, show buffers as shared if they are shared via dma-buf as well (e.g., shared with v4l or some other subsystem). Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Signed-off-by: Alex Deucher Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/drm_gem.c | 16 ++++++++++++++++ include/drm/drm_gem.h | 1 + 2 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 44a948b80ee1..71b5f628d828 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1506,3 +1506,19 @@ int drm_gem_evict(struct drm_gem_object *obj) return 0; } EXPORT_SYMBOL(drm_gem_evict); + +/** + * drm_gem_object_is_shared_for_memory_stats - helper for shared memory stats + * + * This helper should only be used for fdinfo shared memory stats to determine + * if a GEM object is shared. + * + * @obj: obj in question + */ +bool drm_gem_object_is_shared_for_memory_stats(struct drm_gem_object *obj) +{ + if ((obj->handle_count > 1) || obj->dma_buf) + return true; + return false; +} +EXPORT_SYMBOL(drm_gem_object_is_shared_for_memory_stats); diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index 369505447acd..86a9c696f038 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -552,6 +552,7 @@ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, bool (*shrink)(struct drm_gem_object *obj)); int drm_gem_evict(struct drm_gem_object *obj); +bool drm_gem_object_is_shared_for_memory_stats(struct drm_gem_object *obj); #ifdef CONFIG_LOCKDEP /** From patchwork Tue Jan 30 16:12:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537777 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 2B64EC46CD2 for ; Tue, 30 Jan 2024 17:02:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20ECB10F933; Tue, 30 Jan 2024 17:02:49 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2069.outbound.protection.outlook.com [40.107.237.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62F3C10F93D; Tue, 30 Jan 2024 17:02:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g33tWUehh0hMv2DxG05eHMVFrjf0F0NcRHN0CeNDGHEMO5CQJBgZLCDTCQh19HBWrMIPi/auEKIJhDw0cmbEv6NZl7ObG8yXBxApGtDzOljjN17H+tj1g+q27g0qVAblPqpb7SaE++KEVHkPrT7bt/iq/uVA32t4Oj6EylwJa62IXSYos9T7+2qSlyAEIerJT3twI0wE5+VAyutibcwwrQZj9vmBF6/DrvG34J1mCVhZAvyT+1ekSUiOVN24cUqGxwQpRLeKJJl1L7ypwuBEZQmi/Ea3BqB5JDDO6gY77/o7zPPg3h9hfj96I/uYAvZcK/QpJ7LD0GWOhCwugXGNXA== 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=ESIWDLAIrrDfzwok9c5tdJAbhFor14fjd5pWlWW32kU=; b=XaqzUxBoCkbW96xLlkqMuncOlVgZ+Zu/hDhbjolNOhpwYOZomQS1AQnLztq7nMssJF4a98vNnHnqRq9aokg5NNq6a8HlkQF8J/Pa0ctsCl91ANRcfwgU9EUIUUknEzYKN+IiCTAasGFwKXHCcKljRad2wzSCvHfoqDZCrITRMAXSDniG8eCRZN4FH5Wpf8Gv3/+xnSzVPt4+Fo9VV6PlB7hVdvnV1cwAI+zcJ+XuA3v+oHgbLlxBSRGSAneQ0e/5GmexyYtOIe7tJY2fSlq9mTgz2JEnMyvVqkWvvtN5xmMXD3iBxMV9ovsomqcEh41Sayf+nNw7tjeBqDNutULf2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ESIWDLAIrrDfzwok9c5tdJAbhFor14fjd5pWlWW32kU=; b=Os/YC/pJRMi5u4END/HlRfh6LhHnbEfl9gkLmegQUc3RfD1MQZhbUMUtLruhyt3eEih+j+mc51D9rZzVFPJfu0MuZ0mGEXM+rf71IqWkRIoYT+gEsCQdLGYJdNJyqVoHXXpNtNwj0N3HGEsvb7v7P3jKzkz/utNzdloCnhs0xlo= Received: from CH0PR03CA0357.namprd03.prod.outlook.com (2603:10b6:610:11a::6) by DM4PR12MB5230.namprd12.prod.outlook.com (2603:10b6:5:399::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 16:13:28 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::2e) by CH0PR03CA0357.outlook.office365.com (2603:10b6:610:11a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Tue, 30 Jan 2024 16:13:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:13:28 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:26 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 3/6] drm: update drm_show_memory_stats() for dma-bufs Date: Tue, 30 Jan 2024 11:12:32 -0500 Message-ID: <20240130161235.3237122-4-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|DM4PR12MB5230:EE_ X-MS-Office365-Filtering-Correlation-Id: 2555c330-cd2e-4cca-6a8f-08dc21ae6534 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SW/20DUSdYbHA6Vn2oLOECz/iJ1zZf73aCITWVQXCnUH+Pb6O6hNsqD7ftOiDzDIVOPUOUxZn4NvGGsjCSfJ/tdK6zHVx5OV92TgnAjr1eLjZ/1l4Hu2RpWqFv5h6tY8b0o1dTBxmjK1dr1usyh9+i/th1sXb9XnQiJS8Tolo8oXeJn9Q2c/4P0QlpqJPGxkltRhpomlh6HdZDuQ4jsZoV3lB14vQjwi+16yUU8gLmn9YiETphVbCYEb2kBpB6ZYqMO/UXnOLXd2Ku4M5BaxgmGEzyiuw0cA963FW2W/T0/17uSCyrtuyZ8L8V7LLTa3kDafZDDFqgTHqlX3HayjAHkifYPloyEK4O7HlKjT5GEnFRInspBIp25lZ1Dd1X3V8U4UEsQ1nr/za4TAdYnpNtQOxQLTDXNUdpxcvvEOybuq+x4tUz34EEAJqd8xY5BfsnBNV1jFLp8AuH2/qHw87dbgCohSIPfLheykl5SQiPQD0KNobOj3n1elwy+zrblzQaHW1mHTVaqfsWHIpaiimB+oomiE88Nt5OwSAg+MQdeyS8eD2citVnkORnN+m3ofsmDHI+3mhcFVtBvyRbvWZv5BzXGK2/4h0lWtScXWbfMeC56pRIMioQiHxBqfCg4ImkjEP1dJGL5LqbJJ9ZJkZc526XVpZ7tAiLqubhmVYRaMHX4B9sj4K9QGgCbBFKQUqKExX1/sZPbSs0B5AataD4Mv3jz4e7pGbGOSs5zccAUQstQxxMVr8HZH6KqHfXaKNmnLKsirFKPO6AYV7HeR8g== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(396003)(346002)(376002)(230922051799003)(82310400011)(64100799003)(1800799012)(451199024)(186009)(36840700001)(40470700004)(46966006)(40480700001)(40460700003)(83380400001)(86362001)(36756003)(356005)(16526019)(81166007)(7696005)(1076003)(47076005)(36860700001)(426003)(2616005)(336012)(26005)(41300700001)(70586007)(110136005)(54906003)(2906002)(966005)(8676002)(4744005)(478600001)(70206006)(316002)(82740400003)(6666004)(8936002)(5660300002)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:13:28.4946 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2555c330-cd2e-4cca-6a8f-08dc21ae6534 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5230 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Show buffers as shared if they are shared via dma-buf as well (e.g., shared with v4l or some other subsystem). v2: switch to gem helper Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Reviewed-by: Rob Clark (v1) Signed-off-by: Alex Deucher Cc: Rob Clark Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/drm_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 8c87287c3e16..638ffa4444f5 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -913,7 +913,7 @@ void drm_show_memory_stats(struct drm_printer *p, struct drm_file *file) DRM_GEM_OBJECT_PURGEABLE; } - if (obj->handle_count > 1) { + if (drm_gem_object_is_shared_for_memory_stats(obj)) { status.shared += obj->size; } else { status.private += obj->size; From patchwork Tue Jan 30 16:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537776 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 A6491C48285 for ; Tue, 30 Jan 2024 17:02:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A193B10F950; Tue, 30 Jan 2024 17:02:48 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2087.outbound.protection.outlook.com [40.107.223.87]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F61010F93B; Tue, 30 Jan 2024 17:02:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zcl6ifCPTzGAlHYbsbwWo6nZ2RnGyBqA+uFPC7MCY9ztpYaY+DwQn/FM9SxP87i2t5oskMIC2leksw8EnJ7Jaj2M8C05j7VbaTxgpCX/MNunesJh3QBf5QkB3prD7VAe/dndvULTA2R6mqGM9hAwEKD2iW3qC3CGA0OzeBl44q+rVdRAHE3J8lw74THHz1BCPt/dtey10WZ4ZHrnlVOQeVTV3zSb1fXE1MVZY1KE5CzRjxtr5zVUK5AGzXj+FCzB2yyKv+ajirC2oraFC7NaJaksqP0ugZhabL6dQfgy2gHI6fe4DpJ8ipJd5aqIdfe6tw455i/J60RC66ifIMWYQQ== 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=5YVKnoGgKkZc7MoAGUDW0o4DHwsUZtPtNerq3Jcp78A=; b=YAc673CWlLBI1ZxwQTcFtpzmphV2rsCK9ZSF2IYSsx+1hMmyJXZ7TSrAvQOyTyoFbY9724C9FRMSh3/xcyS5OSZQcCmavZDO1AGtCWck72lI8B15j8nKXMbhb9FOaofR/zb9MMYvDMI8jO4pXW6u/HSrZyIU6T89dcJylgeKYGZbyiuXNXRBXrzSjQYMqzGQS24GOY0AUpiPezhxNid3Qc3vAzsbWk/93APpd85z/oqNOSBo4BK/40A991dGsB37T4rZBAHDUQaXRiAduGTWBR6mHttIoKK5ajX81WHQDmayjRgRse0pyFW82zmDxwQGcKkgIFQm7sUPlqW6XzXhVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5YVKnoGgKkZc7MoAGUDW0o4DHwsUZtPtNerq3Jcp78A=; b=F6bF8ToX9gJuEx+FFermQkwV7FEMZa4CHsED2QK5CjRKEsKKCxWhzgK0L6OGUSdZ5Q2yDmQjsr09Vdt2b9dNiM47bUnwbF5F9yIZyGoeFYg8qjCg9d6G/WOv8Spm/oOJ79GbMmFtdAS4X6ARbelrffOdiO+3X/X0MwzBaNI7qrY= Received: from CH0PR03CA0341.namprd03.prod.outlook.com (2603:10b6:610:11a::18) by PH8PR12MB7026.namprd12.prod.outlook.com (2603:10b6:510:1bd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Tue, 30 Jan 2024 16:13:29 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::9f) by CH0PR03CA0341.outlook.office365.com (2603:10b6:610:11a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Tue, 30 Jan 2024 16:13:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:13:28 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:27 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 4/6] drm/amdgpu: add shared fdinfo stats Date: Tue, 30 Jan 2024 11:12:33 -0500 Message-ID: <20240130161235.3237122-5-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|PH8PR12MB7026:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d1c6115-8f35-488e-a31c-08dc21ae656d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hUy3lR+Pw8fRWPkS+jFYlGVEnqkLUWc+rZ0Q94fwjqbv96l/JzxhTldVSork7sRcRp6d+jlm6UJkIaMgrQvDZC+oXX0cK42X42bszcQw+Ze5AoLv4dfRSImK4Js1Hcmfddgjq3U0vBmcSCDBkyC7muMomKQYLgdCK48W80g1VrVex3O/5hErXxc74rhBB52w7Qt1KI+HobUq4sFQrfI5ZpUAZ+dHeFLwySIXo/IctwuAm+MxA3lnp+3m+wwRtm+G+jOxWK9ZtE0YVwdCtjdCRcrI5h/b5TBbd0SWm0QRdSaneY5KRY+rgYv1Izg5FDWES8XKyo3Y675ciy77dWj+pnBgq7NPzY6ZHAA2jqpUf/91WCMlwx+bsNzhU9Dwrl8j+pDaptSaiFC/IfFCOWfDVK0/IwVPGQOEC2JSuofAAUrY+yOymMVlOzIaPBFoZIgYL6OWBdZQl+lGr5cHxNElvsgONZVfpVXSP3GHtHT48HlEAJl8sTylIpyWnEi0+UBzqDe6vFaa7ywBdZ9+8Ilsed+vIy7hfCWM6YgD2digZo9zFfbofuc6hxdIger10UL7gln4U0oypu1NzRK5r87mspYKrqOKYEKuRP/n0ubJvQb1F2g17kJki+Zd2vOfOxvxWcJj345OLxzdA5zCMmkOt4vMCeX8IAD4qWUn9HS4rcay4P3kgqrOzueCB+nmUgtgVoxURjj0gtLp+FYcdAcohT4q2ZjdRcQF5hq+O86ncEmN+9o2ubLCveyM/lm8VCy/ X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(376002)(346002)(396003)(136003)(39860400002)(230922051799003)(451199024)(186009)(82310400011)(64100799003)(1800799012)(40470700004)(46966006)(36840700001)(47076005)(70586007)(70206006)(6666004)(336012)(40480700001)(40460700003)(1076003)(110136005)(426003)(316002)(54906003)(86362001)(81166007)(4326008)(8936002)(356005)(8676002)(36860700001)(478600001)(7696005)(2616005)(16526019)(26005)(83380400001)(966005)(82740400003)(36756003)(2906002)(5660300002)(41300700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:13:28.8696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d1c6115-8f35-488e-a31c-08dc21ae656d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7026 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add shared stats. Useful for seeing shared memory. v2: take dma-buf into account as well v3: use the new gem helper Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Signed-off-by: Alex Deucher Cc: Rob Clark --- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 11 +++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c index 5706b282a0c7..c7df7fa3459f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c @@ -97,6 +97,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) stats.requested_visible_vram/1024UL); drm_printf(p, "amd-requested-gtt:\t%llu KiB\n", stats.requested_gtt/1024UL); + drm_printf(p, "drm-shared-vram:\t%llu KiB\n", stats.vram_shared/1024UL); + drm_printf(p, "drm-shared-gtt:\t%llu KiB\n", stats.gtt_shared/1024UL); + drm_printf(p, "drm-shared-cpu:\t%llu KiB\n", stats.cpu_shared/1024UL); + for (hw_ip = 0; hw_ip < AMDGPU_HW_IP_NUM; ++hw_ip) { if (!usage[hw_ip]) continue; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 425cebcc5cbf..e6f69fce539b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1276,25 +1276,36 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, struct amdgpu_mem_stats *stats) { uint64_t size = amdgpu_bo_size(bo); + struct drm_gem_object *obj; unsigned int domain; + bool shared; /* Abort if the BO doesn't currently have a backing store */ if (!bo->tbo.resource) return; + obj = &bo->tbo.base; + shared = drm_gem_object_is_shared_for_memory_stats(obj); + domain = amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type); switch (domain) { case AMDGPU_GEM_DOMAIN_VRAM: stats->vram += size; if (amdgpu_bo_in_cpu_visible_vram(bo)) stats->visible_vram += size; + if (shared) + stats->vram_shared += size; break; case AMDGPU_GEM_DOMAIN_GTT: stats->gtt += size; + if (shared) + stats->gtt_shared += size; break; case AMDGPU_GEM_DOMAIN_CPU: default: stats->cpu += size; + if (shared) + stats->cpu_shared += size; break; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index a3ea8a82db23..be679c42b0b8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -138,12 +138,18 @@ struct amdgpu_bo_vm { struct amdgpu_mem_stats { /* current VRAM usage, includes visible VRAM */ uint64_t vram; + /* current shared VRAM usage, includes visible VRAM */ + uint64_t vram_shared; /* current visible VRAM usage */ uint64_t visible_vram; /* current GTT usage */ uint64_t gtt; + /* current shared GTT usage */ + uint64_t gtt_shared; /* current system memory usage */ uint64_t cpu; + /* current shared system memory usage */ + uint64_t cpu_shared; /* sum of evicted buffers, includes visible VRAM */ uint64_t evicted_vram; /* sum of evicted buffers due to CPU access */ From patchwork Tue Jan 30 16:12:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537780 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 E2F0DC4828C for ; Tue, 30 Jan 2024 17:03:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C4D7F10F939; Tue, 30 Jan 2024 17:03:28 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56E8910F939; Tue, 30 Jan 2024 17:03:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gVUAPkgfYb3Iqcs53y1KK3o1enYjGZtIJ0psUDXBC/LT3TEcREhzCP7B8du4K6XKaMD0bY2jwj3x1u9auTwPjRPc0DoEufXAmdt1maqxcqJN+Ko3i/m15OtimDHXKOasVumZpo8640UFDiklCVisf/n4x3bokNC15acSOnYhp76FIGGR+i6zVeHd/vSTb9afU1ZegXwjNQQJq9WPVPBNSPFYom+1XwRjoK8AgynqdNBVrFXalNHPVslNfeAHktToxc/FuBxmz8kG0hKFA/98H3bpJ54kxthsrvW2K2UIDlIKobn/42i1o09LCsGVuA7Hq2VldirFqzy332A+eI4w6Q== 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=rMlIYd6LD55A1c0lmDjYN7NhFdYbw2a7qtNk5Td62I8=; b=RGiY2yBhEa0kP3SPlcovDFwkTIy6yCIZNx2J4BWIv2wxpc3vAxQyK4btbrDBdBIVECDPEx7NWmCejRyLgpogbX5xhTzyUrhfkVTNse9VzknV2xuSrX2aYmON19udD34lDJWITVCbiskkgD8C9+z7cPGx6B4jSNgPFkIrxtlAB4F6Hm4uZuShmRett46d/w1w+ZqQ8iWFHL0Wv8al197QxZxF5XPTRtqaV6BsBetruL3QkGygyeOJZurT0UA1LqbAMJTyad2V8eLnIpVRI856Oftnjju3sqCnOLMIbEPDOkg4R+8g23TGUCIXJwl8PEnNBxMLdzZLRHPcgDBTR3NOnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rMlIYd6LD55A1c0lmDjYN7NhFdYbw2a7qtNk5Td62I8=; b=SUVWiXbX3GCaDTBNE9hnz4ZrgLMMwn3SlxjOoJ1gj4zF1cDz6MLeXPRhTritbYmhQvwhjxD+dxjav12xCRsV2fOxGpRue/osBfYishZBTbIZjk81Qizshcrv+qRlJMitrC4fkucA5FeC5ezLj8KFdmV4D3rQjS8LVM1SwA34RA0= Received: from CH0PR03CA0352.namprd03.prod.outlook.com (2603:10b6:610:11a::21) by DM3PR12MB9389.namprd12.prod.outlook.com (2603:10b6:0:46::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 16:14:06 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::90) by CH0PR03CA0352.outlook.office365.com (2603:10b6:610:11a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34 via Frontend Transport; Tue, 30 Jan 2024 16:14:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:14:06 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:28 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 5/6] drm/i915: Update shared stats to use the new gem helper Date: Tue, 30 Jan 2024 11:12:34 -0500 Message-ID: <20240130161235.3237122-6-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|DM3PR12MB9389:EE_ X-MS-Office365-Filtering-Correlation-Id: c2b86796-6f4a-4351-f573-08dc21ae7bf4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H+L/RVtgLda1Nj1fS27HYa8WZxCTGyTB/XBE/JhtEFq7Agim4HDgkuTO6Ei3EHZNXxoiJwx4V4WHybOs7uNc/vmRqfQTRDWoOuXo0fiDA0w9/Lrjq05rKbA31Tdv7KGGGxlxLNg6sRnhISmALs9aG3rkwQOT+Ug7NGoaV/6jw1b/jMtIrTh0rtHxrK6VoihipHhsYonB1fRodoLKiZmsutgDi6scGJzKR90YgKJcLyayvEoKu+r1vZegFezytcUaCZlkxlXjScdLVI0kXT+lSJRhh8lkkodBDYB7zFSzIR/CDZsLA6ucPZEh2C0xch+PKF7krmOWCEjyE1CidYi3aFCUelOvzow9yo12gIE4POvujSylu5lrxp2ukfg3cB06GO7HHA+c8TQ1CUegLMMX5BTVtZe1+LKQj+9bAfb6PrLzHf7VUzpOX/7OvrjDlqzSNgEl45gMp9hSDps19+UGM6GHARddeEHns+BdVBmV+C2NJ95m7SXoKD0SdWDKKz6RwzSBC3HdSx6QhSBbfKNp/mKckaEoWwOmw1jeu93ciGOs9ZGyMjYXvcdZ3ip/i7+zIsAoYpMD3CiSeJFSRz3Emn1RvG9StXZo7AIxgjTo1O4YUtNiopI/AfmSmJdbw3qQnM90Z6l2G6OjAX9BYX92WKYPHZUI5rtATgmX+towHPqoDODQUe1toO+DoOVb8MnDAI60YGLNGc94AwccFTjKLUXY09uEYQyzPD8jXErzOKmfcRoBtk555HVie4ha0WeU0cAy+Dl+5zUaT3SohYkMrQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(396003)(136003)(376002)(230922051799003)(186009)(64100799003)(82310400011)(451199024)(1800799012)(40470700004)(36840700001)(46966006)(40480700001)(40460700003)(1076003)(83380400001)(426003)(26005)(7696005)(336012)(6666004)(16526019)(36756003)(86362001)(82740400003)(356005)(8936002)(4326008)(4744005)(41300700001)(8676002)(5660300002)(36860700001)(2616005)(47076005)(70586007)(110136005)(70206006)(966005)(478600001)(2906002)(316002)(81166007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:14:06.6663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2b86796-6f4a-4351-f573-08dc21ae7bf4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9389 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Switch to using the new gem shared memory stats helper rather than hand rolling it. Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Signed-off-by: Alex Deucher Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_drm_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c index fa6852713bee..f58682505491 100644 --- a/drivers/gpu/drm/i915/i915_drm_client.c +++ b/drivers/gpu/drm/i915/i915_drm_client.c @@ -53,7 +53,7 @@ obj_meminfo(struct drm_i915_gem_object *obj, obj->mm.region->id : INTEL_REGION_SMEM; const u64 sz = obj->base.size; - if (obj->base.handle_count > 1) + if (drm_gem_object_is_shared_for_memory_stats(&obj->base)) stats[id].shared += sz; else stats[id].private += sz; From patchwork Tue Jan 30 16:12:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 13537781 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 6795CC46CD2 for ; Tue, 30 Jan 2024 17:03:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC76010F4CA; Tue, 30 Jan 2024 17:03:34 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2051.outbound.protection.outlook.com [40.107.96.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53B161131EC; Tue, 30 Jan 2024 17:03:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WQKx6q2sfbjEUO5avuf42QdFJ/FTOtaNS4zXWtWtgveyUmEaMG3Oh++N+YM6gmkXxtEHePjenqBjXdEPYxJidf/ueSm7q1DZpb2SmgbtME2cE3CnRT6KJ3JjIm+vVXou0JYCX9eud36LBG+A6fcJB7J3CtFw2IpisgY5IT/Z3+ZEv3faYuFnx/P8aULC3hsu7g+K1issEMfQGnTBTBhSwY67Ftzjym4nkY2LSAcegDtP2VgFvM3/kjyIRBxHYRH9Vdpr3WnD6HklBXznUiFzgNKbYqJM9mTKGCcGT5+pXU4vV1Bnkwj+keTGyZGd+3IHyJPXiefwoddSWp+FdqbfEQ== 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=FRtM1wsUyneTByH711abrNxiqsruk/2WT67jRGs7CKc=; b=E7lx/XK7SYf6ktC3g0/Jad+pqX0LPUP+3DSBTXmo8b0kpr2nEpG+7p6cbl74p87LJNNdwxc6OU29GL4JtnPVhrGjyVmZrS97WedNLU9gR0LnSXEUniKaGHgz4op5SwLR2zpkdruqe0uuUu8QbNjhjCmrApQEXXUV19F3LQ3Y7JRjOndD4Ufmy1xGuQYGcxRjyP+HL9Wl7Dm9DQ5r/gcASeguOljXgzHbCr1Qq8NaRfSOVyzEYreXxflS4P08TvmjGqG9FBS2MQebHPEthA8rPnZUJNmQa7tnaXngiCWqWHBgKCD3xtOLV6ZawraXIqGVrJP1r83JMoO8BwzhiDrnYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FRtM1wsUyneTByH711abrNxiqsruk/2WT67jRGs7CKc=; b=Pf4AHUyaUSOdf4wXZ351vrD81LfYrdPq+EFtMxO/X2qb0ZagWJdAmUoteJ4U/fD0eA3QsbgMjtXHKTvcJzVsq201WUF9/WGIz9TJs9rpnD5uMm8IgwCCumoB2AJ3bjV050s9IQy71HBr9tBPBS52+M8+bxFCoeXkuUnNm9hjhqU= Received: from CH0PR03CA0331.namprd03.prod.outlook.com (2603:10b6:610:11a::22) by SN7PR12MB8433.namprd12.prod.outlook.com (2603:10b6:806:2e5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 16:14:09 +0000 Received: from DS2PEPF00003443.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::a1) by CH0PR03CA0331.outlook.office365.com (2603:10b6:610:11a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34 via Frontend Transport; Tue, 30 Jan 2024 16:14:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003443.mail.protection.outlook.com (10.167.17.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Tue, 30 Jan 2024 16:14:08 +0000 Received: from tr4.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Tue, 30 Jan 2024 10:13:29 -0600 From: Alex Deucher To: , , , , , Subject: [PATCH 6/6] drm/xe: Update shared stats to use the new gem helper Date: Tue, 30 Jan 2024 11:12:35 -0500 Message-ID: <20240130161235.3237122-7-alexander.deucher@amd.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240130161235.3237122-1-alexander.deucher@amd.com> References: <20240130161235.3237122-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003443:EE_|SN7PR12MB8433:EE_ X-MS-Office365-Filtering-Correlation-Id: 2053418d-3287-45bd-8456-08dc21ae7d28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dcfG1E8Jsea48BTopxar8YlNFkz2BwhOV1Nqbz86gVQnhZSo3YMg8VjZtQUnSQdQHWAl8ufb5BL8iNoaOsOcGkycjqwZubIbiovn+KExAM0KCB2Y3cg8/asLzXiRcQgkgNRiBJvQdO4S+MIr7RD6s0PU5dgXGUnizEv/dS52kh+hbx48jyr6bEoAWf3SUhaOi1VJ4o9TesAeSBbX1h6h41B5wcOtylIMQ8vgJ/M37Fd0AdtvFppmvKJXjF7F49lGoInxV55KqjdMO8N6Bhwu8Nn/IR0XbXfFnTqU5gYNhrYjMObOj/Kg0RrmGPMrDGDbhbwm2erHDvoQRF5HNDzfpwUe/Ngks7AQSsvfGagDuTg/378BarQns4m8M1ASbVvsVb4dH+ju9c3nmQFo3v0HSklIa4yUHXzs1HvR9BrFnXgAzPsgHWFXFtznnpcKMvEIua53THBnBBKXnpHfP7TlTbASeTd3Sz4b2Hw2UCB/fBLsaVqSOAVQK0L3Yn4XmOwOUqqDiToyH103MDyakrIeQ6wuaw6K3FjlXrQoBaBREOMqNYL65IXdyrTHvm0s4KtjbzVK9201w4WBETiw5p7xXeXoquz7E8tFAm1MjEY38RDyggb5xGk/q2iiXpZRpqKdeVw55LwCNekj2MR3dy3T1fi4S2i7qKZtiQH0zvJspa8khULCm9I642WyoajtqlAbddfvjn4QmY9eRtqw0nsU+r78coHG5FIcuPAuYWAkFMaBhZXnY0B4C9zby7ikg9n9bA0Bkys3esY4zvF4Bm3+iQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(136003)(346002)(376002)(230922051799003)(186009)(451199024)(1800799012)(82310400011)(64100799003)(46966006)(36840700001)(40470700004)(36860700001)(47076005)(110136005)(316002)(83380400001)(7696005)(70586007)(70206006)(8936002)(966005)(8676002)(26005)(4326008)(478600001)(2906002)(36756003)(1076003)(6666004)(16526019)(4744005)(336012)(426003)(86362001)(5660300002)(2616005)(41300700001)(40480700001)(40460700003)(81166007)(82740400003)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 16:14:08.6663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2053418d-3287-45bd-8456-08dc21ae7d28 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003443.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8433 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Switch to using the new gem shared memory stats helper rather than hand rolling it. Link: https://lore.kernel.org/all/20231207180225.439482-1-alexander.deucher@amd.com/ Signed-off-by: Alex Deucher --- drivers/gpu/drm/xe/xe_drm_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c index 82d1305e831f..ecf2eb67d310 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.c +++ b/drivers/gpu/drm/xe/xe_drm_client.c @@ -113,7 +113,7 @@ static void bo_meminfo(struct xe_bo *bo, else mem_type = XE_PL_TT; - if (bo->ttm.base.handle_count > 1) + if (drm_gem_object_is_shared_for_memory_stats(&bo->ttm.base)) stats[mem_type].shared += sz; else stats[mem_type].private += sz;