Skip to content

Commit 0a49c92

Browse files
author
Jocelyn Falempe
committed
drm/xe: Use non-interruptible wait when moving BO to system
JIRA: https://issues.redhat.com/browse/RHEL-53571 Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git (v6.12.9) commit 7f13d82 Author: Nirmoy Das <nirmoy.das@intel.com> AuthorDate: Fri Dec 13 13:24:14 2024 +0100 Commit: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CommitDate: Thu Jan 9 13:33:49 2025 +0100 commit 528cef1 upstream. Ensure a non-interruptible wait is used when moving a bo to XE_PL_SYSTEM. This prevents dma_mappings from being removed prematurely while a GPU job is still in progress, even if the CPU receives a signal during the operation. Fixes: 75521e8 ("drm/xe: Perform dma_map when moving system buffer objects to TT") Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: stable@vger.kernel.org # v6.11+ Suggested-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241213122415.3880017-1-nirmoy.das@intel.com Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> (cherry picked from commit dc5e20a) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
1 parent 29c65dd commit 0a49c92

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/xe/xe_bo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
722722
new_mem->mem_type == XE_PL_SYSTEM) {
723723
long timeout = dma_resv_wait_timeout(ttm_bo->base.resv,
724724
DMA_RESV_USAGE_BOOKKEEP,
725-
true,
725+
false,
726726
MAX_SCHEDULE_TIMEOUT);
727727
if (timeout < 0) {
728728
ret = timeout;

0 commit comments

Comments
 (0)