Commit 8462d16d authored by Piotr Piórkowski's avatar Piotr Piórkowski Committed by Michal Wajdeczko
Browse files

drm/xe: Combine userspace context check 



Both vm->xef and XE_LRC_CREATE_USER_CTX indicate in xe_lrc_init that
the context originates from userspace. However, XE_LRC_CREATE_USER_CTX
has a broader scope as it may be set even when no vm->xef is present.
The XE_BO_FLAG_PINNED_LATE_RESTORE flag can be extended to both cases,
so there is no point in handling the two cases separately.
Let's combine vm->xef and XE_LRC_CREATE_USER_CTX checks to detect
userspace context.

Signed-off-by: default avatarPiotr Piórkowski <piotr.piorkowski@intel.com>
Suggested-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://lore.kernel.org/r/20251003162619.1984236-6-piotr.piorkowski@intel.com
parent b48140f4

drivers/gpu/drm/xe/xe_lrc.c

+2 −4
Original line number Diff line number Diff line
@@ -1412,11 +1412,9 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, 


	bo_flags = XE_BO_FLAG_VRAM_IF_DGFX(tile) | XE_BO_FLAG_GGTT |

		   XE_BO_FLAG_GGTT_INVALIDATE;

	if (vm && vm->xef) /* userspace */

		bo_flags |= XE_BO_FLAG_PINNED_LATE_RESTORE;



	if (init_flags & XE_LRC_CREATE_USER_CTX)

		bo_flags |= XE_BO_FLAG_FORCE_USER_VRAM;

	if ((vm && vm->xef) || init_flags & XE_LRC_CREATE_USER_CTX) /* userspace */

		bo_flags |= XE_BO_FLAG_PINNED_LATE_RESTORE | XE_BO_FLAG_FORCE_USER_VRAM;



	lrc->bo = xe_bo_create_pin_map_novm(xe, tile,

					    bo_size,