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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51796C43470 for ; Tue, 18 May 2021 01:09:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 316E761369 for ; Tue, 18 May 2021 01:09:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345384AbhERBLC (ORCPT ); Mon, 17 May 2021 21:11:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:56684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238090AbhERBLA (ORCPT ); Mon, 17 May 2021 21:11:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7758561354; Tue, 18 May 2021 01:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621300183; bh=Q7N5BFJD1w+E3XQGJHFoJg4hWxx3QjNXlxWafl5zlYU=; h=From:To:Cc:Subject:Date:From; b=YMfEP7m6CIKFLPmKNgY9J6OvgmibnUgQn9tZifjmKMGGrh5+VyDG0SSVGiRoPpC8g QcXrF6fkU3mqyPmPu+2eC+srUY9lAUmotDsXpQWlR03Zkl7cHx9EuXONG3xtjvjh4u xz0KoQ2QoSfAhwYWOHBk88To1qgJiB15ATnpHPH/MD6bhlbxY5iCsWg3v5sQTUvugF 6e5WhGO3QE6HVjfH2awDp+ThDTiWga6HZSeE4bE8RcVcpZfWWH85q43TFLo+y/0qkz aeXxYORL20F73gIdo5skQpZ0+K0oeJKS06/f9/Rn2UOxAGdKHlrIVuMeFbpICwrVEt 9ImMI7HktY79g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: xinhui pan , Guchun Chen , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.12 1/5] drm/ttm: Do not add non-system domain BO into swap list Date: Mon, 17 May 2021 21:09:36 -0400 Message-Id: <20210518010940.1485417-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: xinhui pan [ Upstream commit ad2c28bd9a4083816fa45a7e90c2486cde8a9873 ] BO would be added into swap list if it is validated into system domain. If BO is validated again into non-system domain, say, VRAM domain. It actually should not be in the swap list. Signed-off-by: xinhui pan Acked-by: Guchun Chen Acked-by: Alex Deucher Reviewed-by: Christian König Link: https://patchwork.freedesktop.org/patch/msgid/20210224032808.150465-1-xinhui.pan@amd.com Signed-off-by: Christian König Signed-off-by: Sasha Levin --- drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 101a68dc615b..799ec7a7caa4 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -153,6 +153,8 @@ void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo, swap = &ttm_bo_glob.swap_lru[bo->priority]; list_move_tail(&bo->swap, swap); + } else { + list_del_init(&bo->swap); } if (bdev->driver->del_from_lru_notify) -- 2.30.2 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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5D88C43462 for ; Tue, 18 May 2021 01:09:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A8273613AF for ; Tue, 18 May 2021 01:09:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8273613AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D7EA56E566; Tue, 18 May 2021 01:09:44 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 986F06E566 for ; Tue, 18 May 2021 01:09:43 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7758561354; Tue, 18 May 2021 01:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621300183; bh=Q7N5BFJD1w+E3XQGJHFoJg4hWxx3QjNXlxWafl5zlYU=; h=From:To:Cc:Subject:Date:From; b=YMfEP7m6CIKFLPmKNgY9J6OvgmibnUgQn9tZifjmKMGGrh5+VyDG0SSVGiRoPpC8g QcXrF6fkU3mqyPmPu+2eC+srUY9lAUmotDsXpQWlR03Zkl7cHx9EuXONG3xtjvjh4u xz0KoQ2QoSfAhwYWOHBk88To1qgJiB15ATnpHPH/MD6bhlbxY5iCsWg3v5sQTUvugF 6e5WhGO3QE6HVjfH2awDp+ThDTiWga6HZSeE4bE8RcVcpZfWWH85q43TFLo+y/0qkz aeXxYORL20F73gIdo5skQpZ0+K0oeJKS06/f9/Rn2UOxAGdKHlrIVuMeFbpICwrVEt 9ImMI7HktY79g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 1/5] drm/ttm: Do not add non-system domain BO into swap list Date: Mon, 17 May 2021 21:09:36 -0400 Message-Id: <20210518010940.1485417-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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: Sasha Levin , Guchun Chen , xinhui pan , dri-devel@lists.freedesktop.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: xinhui pan [ Upstream commit ad2c28bd9a4083816fa45a7e90c2486cde8a9873 ] BO would be added into swap list if it is validated into system domain. If BO is validated again into non-system domain, say, VRAM domain. It actually should not be in the swap list. Signed-off-by: xinhui pan Acked-by: Guchun Chen Acked-by: Alex Deucher Reviewed-by: Christian König Link: https://patchwork.freedesktop.org/patch/msgid/20210224032808.150465-1-xinhui.pan@amd.com Signed-off-by: Christian König Signed-off-by: Sasha Levin --- drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 101a68dc615b..799ec7a7caa4 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -153,6 +153,8 @@ void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo, swap = &ttm_bo_glob.swap_lru[bo->priority]; list_move_tail(&bo->swap, swap); + } else { + list_del_init(&bo->swap); } if (bdev->driver->del_from_lru_notify) -- 2.30.2