Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [CI 1/4] drm/xe/bo: Fix swapin when moving to VRAM
@ 2023-06-26 13:58 Thomas Hellström
  2023-06-26 13:58 ` [Intel-xe] [CI 2/4] drm/xe/bo: Avoid creating a system resource when allocating a fresh VRAM bo Thomas Hellström
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Thomas Hellström @ 2023-06-26 13:58 UTC (permalink / raw)
  To: intel-xe

When a source system resource had been swapped out, we incorrectly
assumed that we were lacking source data for a move and therefore
cleared the destination instead of swapping in and copying the
swapped-out data. Fix this.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230619152222.11733-3-thomas.hellstrom@linux.intel.com
---
 drivers/gpu/drm/xe/xe_bo.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 71a14e1f25be..d2f4575d8548 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -568,6 +568,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
 	struct xe_tile *tile = NULL;
 	struct dma_fence *fence;
 	bool move_lacks_source;
+	bool tt_has_data;
 	bool needs_clear;
 	int ret = 0;
 
@@ -590,8 +591,10 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
 		goto out;
 	}
 
-	move_lacks_source = !resource_is_vram(old_mem) &&
-		(!ttm || !ttm_tt_is_populated(ttm));
+	tt_has_data = ttm && (ttm_tt_is_populated(ttm) ||
+			      (ttm->page_flags & TTM_TT_FLAG_SWAPPED));
+
+	move_lacks_source = !resource_is_vram(old_mem) && !tt_has_data;
 
 	needs_clear = (ttm && ttm->page_flags & TTM_TT_FLAG_ZERO_ALLOC) ||
 		(!ttm && ttm_bo->type == ttm_bo_type_device);
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-06-26 14:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-26 13:58 [Intel-xe] [CI 1/4] drm/xe/bo: Fix swapin when moving to VRAM Thomas Hellström
2023-06-26 13:58 ` [Intel-xe] [CI 2/4] drm/xe/bo: Avoid creating a system resource when allocating a fresh VRAM bo Thomas Hellström
2023-06-26 13:58 ` [Intel-xe] [CI 3/4] drm/xe/bo: Gracefully handle errors from ttm_bo_move_accel_cleanup() Thomas Hellström
2023-06-26 13:58 ` [Intel-xe] [CI 4/4] drm/xe/bo: Evict VRAM to TT rather than to system Thomas Hellström
2023-06-26 14:00 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [CI,1/4] drm/xe/bo: Fix swapin when moving to VRAM Patchwork
2023-06-26 14:00 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-06-26 14:02 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-06-26 14:05 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-26 14:06 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-26 14:07 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-06-26 14:47 ` [Intel-xe] ○ CI.BAT: info " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox