Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2401919lqp; Sun, 24 Mar 2024 18:00:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUz8AzALNLYjrToxL85vwS4jRaHz6S/oz3yEJwuaO28zQgqTzjq6ykQh2e2n2Q/HivydUfYmuDuyhZe4uey+n60Dth6cPQ3Is/7DnV3mQ== X-Google-Smtp-Source: AGHT+IG+1Ysl8vefnCA9b4sDKKm0WHKjbcVDCnvu6GW+63rXHkfH6+Kx1ORvcE70O4ONWpmcgvzl X-Received: by 2002:a17:903:2341:b0:1e0:310b:b833 with SMTP id c1-20020a170903234100b001e0310bb833mr6838397plh.3.1711328431449; Sun, 24 Mar 2024 18:00:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711328431; cv=pass; d=google.com; s=arc-20160816; b=CG8Gb1rEz9FB9A42lZtXQXpEpBb3l7gAHcLZthkm16ZT7K4CU/4OnD/SE/0+fETxaN RPY3UrcYqfWAkHxb/NdsfBc8WPUGNy/8ty4DICUDge1lhq1UmPmwrq9yuLd144Qe7dzQ XzZhnTglYHnwfkH77hFra0GCpIEoTUZvHliPz8mqMwgkpzIj4wBKQvsdJzbRUzhUMCbY 8NGWzmrBK2DLQHZBVkrfOsSB7c/d94+Obm7KiPFUI47ZFgL+XJmUTc9pxDNC9QMjUJK3 bI43rd1zC5gdNEXqjP610mgylcRv3yoC0wXL8E7VdmQgSSCbpkKjgKMFkQhNz8FCOlPY /BjQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ixNn//tNCDjHTRCtk60QuWlf/bIZE9xal65mNiq7a/g=; fh=a5Ng9J2YYDqDRnoOOYklakC0195R9JkSm63svF5b94U=; b=J8UoJLfh9dYRQxayEkkNjlEa4gejPhXwnKI/aWZ1bi4XxmeHGE9GiMZrbrLgxPSFHu FZamRPGZqnftbN5bVtCqy5HqWqe6z3tWUed0ae6vHYcyHGcGu6UnCktLsUsts83lCPpe R2JnFx++30Rp/xpiFECVdJqIeZSUZuQZp9+npzd/4hQnk0N7zTDBNoA3wYdySmwo0h1i brezrmhHDc7OzWTBJeatVA9DjAKqozw3K889MYx1+RREXMht/tsp41TC46C9j0LEbHDs mEdmzZkSmN4uUGfKTF9Kya9XZyUXXxWICxdggkKgG13X45RLStyYwoBmPGV2qS3a0kLD smwQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EthbQOwc; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113534-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113534-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 11-20020a170902c14b00b001e039a37289si4048228plj.613.2024.03.24.18.00.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 18:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113534-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EthbQOwc; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113534-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113534-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 93112285F77 for ; Mon, 25 Mar 2024 00:58:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A20A21C0189; Sun, 24 Mar 2024 22:45:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EthbQOwc" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A6F521C016A; Sun, 24 Mar 2024 22:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320335; cv=none; b=gob94CjObfm76L23Y4IgC4fzGGqY2S80j4KLSL9iyPPSuQcGymds0X2SFQtKE88texRnlsYB4iJa12lwh9Vk0xjEVc60DZy6WcOPlJnqIDHAWZdksYf/+L8CoEXnnUqpem5I47tqWxm20M0vIwRPk4Cm5EeT7neAUEaBOXQuYeE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320335; c=relaxed/simple; bh=BzF6GyIih33Dzu6RbIucEWNssIgpAID1Xg1s8IEoK9o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Stb1gR1r+jZ9qNACaZUs4WBBBx8tZ7EGIrSjfZ7LzM8DQPwnYDyug00TdpXawTm4iMVJW7cwFtIC3qE/WmNirf5DwDHOBdtKg6jxOtM6pGBNuuyLmzSsqyOuHBBXjxiA4tTSLYUFxkSbrjbisoujRu2yb9uGMXoOpnmLOx5V0w0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EthbQOwc; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBF2EC43390; Sun, 24 Mar 2024 22:45:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320335; bh=BzF6GyIih33Dzu6RbIucEWNssIgpAID1Xg1s8IEoK9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EthbQOwce6Yrd4mQDDKTKkjtztnVi3E5uIjb31uK2LjKMAnFT7NDzcxXr1KwZ/+Sq vqVp1ZTgoR76RSG3lABy3wNfyg61wCujWjG5Ii70zjlKH+/YXlRCl7K70IdXNEZl3x 2IN55R5QNoROdvOV5PIGA8M79H+K46EMNALpuXz3euFjAjryI1q5oj/Zc68r0pgPKj XvUpIwlPZtP6iF0A9krjbTiWKYdXzepUXDw7+jd3hkxORq2vDaf3ZHuqRkIQY1C7+9 7vkDFM15eYni0+7pr2MgzrctAAflchupxPpa3Ocm2OV25T2qDwyKQ11wtg3XK0F05f RYtjXKQb0sGMg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dave Airlie , =?UTF-8?q?Christian=20K=C3=B6nig?= , Danilo Krummrich , Sasha Levin Subject: [PATCH 6.8 643/715] nouveau: reset the bo resource bus info after an eviction Date: Sun, 24 Mar 2024 18:33:42 -0400 Message-ID: <20240324223455.1342824-644-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Dave Airlie [ Upstream commit f35c9af45ea7a4b1115b193d84858b14d13517fc ] Later attempts to refault the bo won't happen and the whole GPU does to lunch. I think Christian's refactoring of this code out to the driver broke this not very well tested path. Fixes: 141b15e59175 ("drm/nouveau: move io_reserve_lru handling into the driver v5") Cc: Christian König Signed-off-by: Dave Airlie Acked-by: Christian König Signed-off-by: Danilo Krummrich Link: https://patchwork.freedesktop.org/patch/msgid/20240311072037.287905-1-airlied@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 00cc7d1abaa39..5d8ee17295424 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1264,6 +1264,8 @@ nouveau_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resource *reg) drm_vma_node_unmap(&nvbo->bo.base.vma_node, bdev->dev_mapping); nouveau_ttm_io_mem_free_locked(drm, nvbo->bo.resource); + nvbo->bo.resource->bus.offset = 0; + nvbo->bo.resource->bus.addr = NULL; goto retry; } -- 2.43.0