Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3580287pxb; Mon, 24 Jan 2022 12:43:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpAs1HhKby+9R9GgT13ZFBLM+akBzaRvL2vTzQ96QMt2mdnbLDvoIU1ktZHiGEnAgPG35U X-Received: by 2002:a63:87c2:: with SMTP id i185mr3472204pge.75.1643056998908; Mon, 24 Jan 2022 12:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056998; cv=none; d=google.com; s=arc-20160816; b=zkdCe8tyTjtKbVmX5fHqieDa7j0Ogj+UyM7ldbzDXnx97yZA16oJOaD1HZm5husvRi p3H/xUIt2rXtomTtJtBZouYsAEhG4V6IOrrmoe4A5MMej6PcDIl6A8WEcHAZgLmrmQPU w2jzvp98BJbxnNct8nB4ow0Pzlpco7YdgYeOZ+e/UFXbW5WMoH49yZQH+KYyZTwUjIu9 03WI0HzLWQfl8zY62Qi1u5WeXmrwPhdfZcCIV7W1xefJ7kSW+xsGeQHb9gPIe0B7oYC3 lCkaAhvzaIpiXXK+/N6VKVniSufrPFmxRLx6AfMN0zmEpzEM7X/cXR88NwnRJFxpjDb4 qDEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6iXmYxdNxvcXXPHMZ2hZx8MeQGQ1LGUNF+j7ZvOEM/A=; b=Vbe3rrHQZ3614nPxl4xDVUxjVmVZLj0dIdBzEDEMxsVZMHVBAer6y/19Yo29p3YhmH tczBOXdupjbtE+bXErFpWMTFrAqEPoCB9dJiJ+9xDKoJVZIz/dkZOxZQL5AvRvdd53je 2Osm0431Lk3L6wcXe0+rhIjkalxxelnowXm86eRXTTHHQt9+SI8a0QXTzQNVE8kbJW99 46f1F0+ocYS33aK+xHtV2leGo/C2uKBvfsLLORg9eucPcJcEhHj8kD85fM6hfF4oELaI ong61h0eVZzaESCLxzpxPYIQB9jFfmlBAa7m8QDKr1SvnOUn6d9EEI7pDVTwTrRyezQy 0PDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DzXojJV8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s1si14348445plk.269.2022.01.24.12.43.03; Mon, 24 Jan 2022 12:43:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DzXojJV8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348601AbiAXUAc (ORCPT + 99 others); Mon, 24 Jan 2022 15:00:32 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:41942 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345039AbiAXToY (ORCPT ); Mon, 24 Jan 2022 14:44:24 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 688F661553; Mon, 24 Jan 2022 19:44:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42230C340E5; Mon, 24 Jan 2022 19:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643053463; bh=a7QTSgbPCTGqbAutw257ceXltTtvuBEN4Cd5NrFUNCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DzXojJV8cwnYo0SEDqiiJP7oNDJBmvG0bGdBvLafWuQGmE7ArX7oMN6t7cqDJSoOa RWilv1L894MX6+kEnni4y+bsMsO1aLg/rK6h0NMwmvJmOyGcimZSE3KIJy70mskVaa gxGxgUNuiHTrs2a1l1N14tQka+OzYzJFmSvfvbXo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , xinhui pan Subject: [PATCH 5.10 041/563] drm/ttm: Put BO in its memory managers lru list Date: Mon, 24 Jan 2022 19:36:46 +0100 Message-Id: <20220124184025.849169194@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: xinhui pan commit 781050b0a3164934857c300bb0bc291e38c26b6f upstream. After we move BO to a new memory region, we should put it to the new memory manager's lru list regardless we unlock the resv or not. Cc: stable@vger.kernel.org Reviewed-by: Christian König Signed-off-by: xinhui pan Link: https://patchwork.freedesktop.org/patch/msgid/20211110043149.57554-1-xinhui.pan@amd.com Signed-off-by: Christian König Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -789,6 +789,8 @@ int ttm_mem_evict_first(struct ttm_bo_de ret = ttm_bo_evict(bo, ctx); if (locked) ttm_bo_unreserve(bo); + else + ttm_bo_move_to_lru_tail_unlocked(bo); ttm_bo_put(bo); return ret;