From nobody Fri Dec 19 19:00:18 2025 Received: from mblankhorst.nl (lankhorst.se [141.105.120.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EE4C8827; Wed, 4 Dec 2024 13:44:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=141.105.120.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733319867; cv=none; b=LfTZtSBn3/1nUJWq8sR15v/ZDim1rBDeE98/jzp38GVvTmvht4xahVl8aJ6KYmHM+wY9rsxjou57qTCpkKPYpoylhaN5hLltEF+rx+WGNUDK0xFcWMxWJFflw9x0KGBV2KCbDk7T1Lb7pV3uEFdHvabAbyoOUijllfAo24G/CeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733319867; c=relaxed/simple; bh=I9cRCosP71yDh0ePXjHoMCpw6t56q2zBrveZE7ey8wA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pAKSbHcuIkuRf+HbODhzofXMnQ20NagRmhntEXCMvnj5zyrSZLZOcLDvtu9c3iYa9Pt5N4dwJkJ9MFTf9ArrNbEUvmuk4Y9ee8/s9rwWUKr8c9uWQA90Qa+EXZ8evn/lYxB5Fup0gjsBo7QuSt8HzzJPQpjfV1PAigmebmxVVhk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lankhorst.se; spf=none smtp.mailfrom=mblankhorst.nl; arc=none smtp.client-ip=141.105.120.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lankhorst.se Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mblankhorst.nl From: Maarten Lankhorst To: linux-kernel@vger.kernel.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Tejun Heo , Zefan Li , Johannes Weiner , Andrew Morton , Friedrich Vock , Maxime Ripard Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, Maarten Lankhorst , Maarten Lankhorst Subject: [PATCH v2 7/7] drm/gem: Add cgroup memory accounting for VRAM helper. Date: Wed, 4 Dec 2024 14:44:07 +0100 Message-ID: <20241204134410.1161769-8-dev@lankhorst.se> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204134410.1161769-1-dev@lankhorst.se> References: <20241204134410.1161769-1-dev@lankhorst.se> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maxime Ripard This allows any driver using the VRAM helper to set limits on VRAM using cgroup. Signed-off-by: Maxime Ripard Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/drm_gem_vram_helper.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_ge= m_vram_helper.c index 22b1fe9c03b81..70979523ee984 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -925,6 +925,7 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init); static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *de= v, uint64_t vram_base, size_t vram_size) { + struct ttm_resource_manager *man; int ret; =20 vmm->vram_base =3D vram_base; @@ -939,8 +940,20 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, s= truct drm_device *dev, =20 ret =3D ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM, false, vram_size >> PAGE_SHIFT); - if (ret) + if (ret) { + ttm_device_fini(&vmm->bdev); return ret; + } + + man =3D ttm_manager_type(&vmm->bdev, TTM_PL_VRAM); + man->cg =3D drmm_register_region(dev, "vram", size); + if (IS_ERR(man->cg)) { + ret =3D PTR_ERR(man->cg); + + ttm_range_man_fini(&vmm->bdev, TTM_PL_VRAM); + ttm_device_fini(&vmm->bdev); + return ret; + } =20 return 0; } --=20 2.43.0