Takashi Iwai 698dcf
From fea456d82c19d201c21313864105876deabe148b Mon Sep 17 00:00:00 2001
Takashi Iwai 698dcf
From: Dave Airlie <airlied@redhat.com>
Takashi Iwai 698dcf
Date: Tue, 20 Oct 2020 08:22:53 +1000
Takashi Iwai 698dcf
Subject: [PATCH] drm/ttm: fix eviction valuable range check.
Takashi Iwai 698dcf
Mime-version: 1.0
Takashi Iwai 698dcf
Content-type: text/plain; charset=UTF-8
Takashi Iwai 698dcf
Content-transfer-encoding: 8bit
Takashi Iwai 698dcf
Git-commit: fea456d82c19d201c21313864105876deabe148b
Takashi Iwai 698dcf
Patch-mainline: v5.10-rc1
Takashi Iwai 698dcf
References: git-fixes
Takashi Iwai 698dcf
Takashi Iwai 698dcf
This was adding size to start, but pfn and start are in pages,
Takashi Iwai 698dcf
so it should be using num_pages.
Takashi Iwai 698dcf
Takashi Iwai 698dcf
Not sure this fixes anything in the real world, just noticed it
Takashi Iwai 698dcf
during refactoring.
Takashi Iwai 698dcf
Takashi Iwai 698dcf
Signed-off-by: Dave Airlie <airlied@redhat.com>
Takashi Iwai 698dcf
Reviewed-by: Christian König <christian.koenig@amd.com>
Takashi Iwai 698dcf
Cc: stable@vger.kernel.org
Takashi Iwai 698dcf
Link: https://patchwork.freedesktop.org/patch/msgid/20201019222257.1684769-2-airlied@gmail.com
Takashi Iwai 698dcf
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 698dcf
Takashi Iwai 698dcf
---
Takashi Iwai 698dcf
 drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
Takashi Iwai 698dcf
 1 file changed, 1 insertion(+), 1 deletion(-)
Takashi Iwai 698dcf
Takashi Iwai 698dcf
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 698dcf
index 70b3bee27850..eb4b7df02ca0 100644
Takashi Iwai 698dcf
--- a/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 698dcf
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 698dcf
@@ -647,7 +647,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
Takashi Iwai 698dcf
 	/* Don't evict this BO if it's outside of the
Takashi Iwai 698dcf
 	 * requested placement range
Takashi Iwai 698dcf
 	 */
Takashi Iwai 698dcf
-	if (place->fpfn >= (bo->mem.start + bo->mem.size) ||
Takashi Iwai 698dcf
+	if (place->fpfn >= (bo->mem.start + bo->mem.num_pages) ||
Takashi Iwai 698dcf
 	    (place->lpfn && place->lpfn <= bo->mem.start))
Takashi Iwai 698dcf
 		return false;
Takashi Iwai 698dcf
 
Takashi Iwai 698dcf
-- 
Takashi Iwai 698dcf
2.16.4
Takashi Iwai 698dcf