Commit 9790bbe3 authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe: Normalize NEEDS_64K BO flag 



In commit 62742d12 ("drm/xe: Normalize bo flags macros"),
we normalized all BO flags but XE_BO_NEEDS_64K. Do it now.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240715180538.1418-2-michal.wajdeczko@intel.com
parent cf1e6edb

drivers/gpu/drm/xe/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ struct xe_bo *___xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo, 
	if (flags & (XE_BO_FLAG_VRAM_MASK | XE_BO_FLAG_STOLEN) &&

	    !(flags & XE_BO_FLAG_IGNORE_MIN_PAGE_SIZE) &&

	    ((xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K) ||

	     (flags & XE_BO_NEEDS_64K))) {

	     (flags & XE_BO_FLAG_NEEDS_64K))) {

		aligned_size = ALIGN(size, SZ_64K);

		if (type != ttm_bo_type_device)

			size = ALIGN(size, SZ_64K);

drivers/gpu/drm/xe/xe_bo.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define XE_BO_FLAG_PAGETABLE		BIT(12)

#define XE_BO_FLAG_NEEDS_CPU_ACCESS	BIT(13)

#define XE_BO_FLAG_NEEDS_UC		BIT(14)

#define XE_BO_NEEDS_64K			BIT(15)

#define XE_BO_FLAG_NEEDS_64K		BIT(15)

#define XE_BO_FLAG_GGTT_INVALIDATE	BIT(16)

/* this one is trigger internally only */

#define XE_BO_FLAG_INTERNAL_TEST	BIT(30)

drivers/gpu/drm/xe/xe_lmtt.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct xe_lmtt_pt *lmtt_pt_alloc(struct xe_lmtt *lmtt, unsigned int level 
					     lmtt->ops->lmtt_pte_num(level)),

				  ttm_bo_type_kernel,

				  XE_BO_FLAG_VRAM_IF_DGFX(lmtt_to_tile(lmtt)) |

				  XE_BO_NEEDS_64K | XE_BO_FLAG_PINNED);

				  XE_BO_FLAG_NEEDS_64K | XE_BO_FLAG_PINNED);

	if (IS_ERR(bo)) {

		err = PTR_ERR(bo);

		goto out_free_pt;