Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: add XE_BO_CREATE_VRAM_MASK
So we don't have to keep repeating VRAM0 | VRAM1. Also if there are ever
more instances, then we have less places to update.
Suggested-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
authored by
Matthew Auld
and committed by
Rodrigo Vivi
8deba79f
7321a713
+5
-5
+3
-5
drivers/gpu/drm/xe/xe_bo.c
+3
-5
drivers/gpu/drm/xe/xe_bo.c
···
999
999
return bo;
1000
1000
}
1001
1001
1002
-
if (flags & (XE_BO_CREATE_VRAM0_BIT | XE_BO_CREATE_VRAM1_BIT |
1003
-
XE_BO_CREATE_STOLEN_BIT) &&
1002
+
if (flags & (XE_BO_CREATE_VRAM_MASK | XE_BO_CREATE_STOLEN_BIT) &&
1004
1003
!(flags & XE_BO_CREATE_IGNORE_MIN_PAGE_SIZE_BIT) &&
1005
1004
xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K) {
1006
1005
size = ALIGN(size, SZ_64K);
···
1063
1064
place->fpfn = start >> PAGE_SHIFT;
1064
1065
place->lpfn = end >> PAGE_SHIFT;
1065
1066
1066
-
switch (flags & (XE_BO_CREATE_STOLEN_BIT |
1067
-
XE_BO_CREATE_VRAM0_BIT |XE_BO_CREATE_VRAM1_BIT)) {
1067
+
switch (flags & (XE_BO_CREATE_STOLEN_BIT | XE_BO_CREATE_VRAM_MASK)) {
1068
1068
case XE_BO_CREATE_VRAM0_BIT:
1069
1069
place->mem_type = XE_PL_VRAM0;
1070
1070
break;
···
1769
1771
{
1770
1772
return bo->ttm.type == ttm_bo_type_device &&
1771
1773
!(bo->flags & XE_BO_CREATE_SYSTEM_BIT) &&
1772
-
(bo->flags & (XE_BO_CREATE_VRAM0_BIT | XE_BO_CREATE_VRAM1_BIT));
1774
+
(bo->flags & XE_BO_CREATE_VRAM_MASK);
1773
1775
}
1774
1776
1775
1777
/**
+2
drivers/gpu/drm/xe/xe_bo.h
+2
drivers/gpu/drm/xe/xe_bo.h
···
17
17
#define XE_BO_CREATE_SYSTEM_BIT BIT(1)
18
18
#define XE_BO_CREATE_VRAM0_BIT BIT(2)
19
19
#define XE_BO_CREATE_VRAM1_BIT BIT(3)
20
+
#define XE_BO_CREATE_VRAM_MASK (XE_BO_CREATE_VRAM0_BIT | \
21
+
XE_BO_CREATE_VRAM1_BIT)
20
22
/* -- */
21
23
#define XE_BO_CREATE_STOLEN_BIT BIT(4)
22
24
#define XE_BO_CREATE_VRAM_IF_DGFX(gt) \