Skip to content

Commit 62742d1

Browse files
lucasdemarchilucasdemarchi
committed
drm/xe: Normalize bo flags macros
The flags stored in the BO grew over time without following much a naming pattern. First of all, get rid of the _BIT suffix that was banned from everywhere else due to the guideline in drivers/gpu/drm/i915/i915_reg.h that xe kind of follows: Define bits using ``REG_BIT(N)``. Do **not** add ``_BIT`` suffix to the name. Here the flags aren't for a register, but it's good practice to keep it consistent. Second divergence on names is the use or not of "CREATE". This is because most of the flags are passed to xe_bo_create*() family of functions, changing its behavior. However, since the flags are also stored in the bo itself and checked elsewhere in the code, it seems better to just omit the CREATE part. With those 2 guidelines, all the flags are given the form XE_BO_FLAG_<FLAG_NAME> with the following commands: git grep -le "XE_BO_" -- drivers/gpu/drm/xe | xargs sed -i \ -e "s/XE_BO_\([_A-Z0-9]*\)_BIT/XE_BO_\1/g" \ -e 's/XE_BO_CREATE_/XE_BO_FLAG_/g' git grep -le "XE_BO_" -- drivers/gpu/drm/xe | xargs sed -i -r \ -e 's/XE_BO_(DEFER_BACKING|SCANOUT|FIXED_PLACEMENT|PAGETABLE|NEEDS_CPU_ACCESS|NEEDS_UC|INTERNAL_TEST|INTERNAL_64K|GGTT_INVALIDATE)/XE_BO_FLAG_\1/g' And then the defines in drivers/gpu/drm/xe/xe_bo.h are adjusted to follow the coding style. Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Lucas De Marchi <[email protected]>
1 parent e27f8a4 commit 62742d1

33 files changed

+202
-203
lines changed

‎drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe,
1717
{
1818
struct xe_bo *bo;
1919
int err;
20-
u32 flags = XE_BO_CREATE_PINNED_BIT | XE_BO_CREATE_STOLEN_BIT;
20+
u32 flags = XE_BO_FLAG_PINNED | XE_BO_FLAG_STOLEN;
2121

2222
if (align)
2323
size = ALIGN(size, align);

‎drivers/gpu/drm/xe/display/intel_fb_bo.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
void intel_fb_bo_framebuffer_fini(struct xe_bo *bo)
1313
{
14-
if (bo->flags & XE_BO_CREATE_PINNED_BIT) {
14+
if (bo->flags & XE_BO_FLAG_PINNED) {
1515
/* Unpin our kernel fb first */
1616
xe_bo_lock(bo, false);
1717
xe_bo_unpin(bo);
@@ -33,9 +33,9 @@ int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
3333
if (ret)
3434
return ret;
3535

36-
if (!(bo->flags & XE_BO_SCANOUT_BIT)) {
36+
if (!(bo->flags & XE_BO_FLAG_SCANOUT)) {
3737
/*
38-
* XE_BO_SCANOUT_BIT should ideally be set at creation, or is
38+
* XE_BO_FLAG_SCANOUT should ideally be set at creation, or is
3939
* automatically set when creating FB. We cannot change caching
4040
* mode when the boect is VM_BINDed, so we can only set
4141
* coherency with display when unbound.
@@ -44,7 +44,7 @@ int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
4444
ttm_bo_unreserve(&bo->ttm);
4545
return -EINVAL;
4646
}
47-
bo->flags |= XE_BO_SCANOUT_BIT;
47+
bo->flags |= XE_BO_FLAG_SCANOUT;
4848
}
4949
ttm_bo_unreserve(&bo->ttm);
5050

‎drivers/gpu/drm/xe/display/intel_fbdev_fb.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
4242
if (!IS_DGFX(dev_priv)) {
4343
obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv),
4444
NULL, size,
45-
ttm_bo_type_kernel, XE_BO_SCANOUT_BIT |
46-
XE_BO_CREATE_STOLEN_BIT |
47-
XE_BO_CREATE_PINNED_BIT);
45+
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
46+
XE_BO_FLAG_STOLEN |
47+
XE_BO_FLAG_PINNED);
4848
if (!IS_ERR(obj))
4949
drm_info(&dev_priv->drm, "Allocated fbdev into stolen\n");
5050
else
5151
drm_info(&dev_priv->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj));
5252
}
5353
if (IS_ERR(obj)) {
5454
obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv), NULL, size,
55-
ttm_bo_type_kernel, XE_BO_SCANOUT_BIT |
56-
XE_BO_CREATE_VRAM_IF_DGFX(xe_device_get_root_tile(dev_priv)) |
57-
XE_BO_CREATE_PINNED_BIT);
55+
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
56+
XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(dev_priv)) |
57+
XE_BO_FLAG_PINNED);
5858
}
5959

6060
if (IS_ERR(obj)) {
@@ -81,8 +81,8 @@ int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb_info *info
8181
{
8282
struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
8383

84-
if (!(obj->flags & XE_BO_CREATE_SYSTEM_BIT)) {
85-
if (obj->flags & XE_BO_CREATE_STOLEN_BIT)
84+
if (!(obj->flags & XE_BO_FLAG_SYSTEM)) {
85+
if (obj->flags & XE_BO_FLAG_STOLEN)
8686
info->fix.smem_start = xe_ttm_stolen_io_offset(obj, 0);
8787
else
8888
info->fix.smem_start =

‎drivers/gpu/drm/xe/display/xe_dsb_buffer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ bool intel_dsb_buffer_create(struct intel_crtc *crtc, struct intel_dsb_buffer *d
4545
obj = xe_bo_create_pin_map(i915, xe_device_get_root_tile(i915),
4646
NULL, PAGE_ALIGN(size),
4747
ttm_bo_type_kernel,
48-
XE_BO_CREATE_VRAM_IF_DGFX(xe_device_get_root_tile(i915)) |
49-
XE_BO_CREATE_GGTT_BIT);
48+
XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(i915)) |
49+
XE_BO_FLAG_GGTT);
5050
if (IS_ERR(obj)) {
5151
kfree(vma);
5252
return false;

‎drivers/gpu/drm/xe/display/xe_fb_pin.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,21 @@ static int __xe_pin_fb_vma_dpt(struct intel_framebuffer *fb,
9999
if (IS_DGFX(xe))
100100
dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
101101
ttm_bo_type_kernel,
102-
XE_BO_CREATE_VRAM0_BIT |
103-
XE_BO_CREATE_GGTT_BIT |
104-
XE_BO_PAGETABLE);
102+
XE_BO_FLAG_VRAM0 |
103+
XE_BO_FLAG_GGTT |
104+
XE_BO_FLAG_PAGETABLE);
105105
else
106106
dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
107107
ttm_bo_type_kernel,
108-
XE_BO_CREATE_STOLEN_BIT |
109-
XE_BO_CREATE_GGTT_BIT |
110-
XE_BO_PAGETABLE);
108+
XE_BO_FLAG_STOLEN |
109+
XE_BO_FLAG_GGTT |
110+
XE_BO_FLAG_PAGETABLE);
111111
if (IS_ERR(dpt))
112112
dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
113113
ttm_bo_type_kernel,
114-
XE_BO_CREATE_SYSTEM_BIT |
115-
XE_BO_CREATE_GGTT_BIT |
116-
XE_BO_PAGETABLE);
114+
XE_BO_FLAG_SYSTEM |
115+
XE_BO_FLAG_GGTT |
116+
XE_BO_FLAG_PAGETABLE);
117117
if (IS_ERR(dpt))
118118
return PTR_ERR(dpt);
119119

@@ -262,7 +262,7 @@ static struct i915_vma *__xe_pin_fb_vma(struct intel_framebuffer *fb,
262262

263263
if (IS_DGFX(to_xe_device(bo->ttm.base.dev)) &&
264264
intel_fb_rc_ccs_cc_plane(&fb->base) >= 0 &&
265-
!(bo->flags & XE_BO_NEEDS_CPU_ACCESS)) {
265+
!(bo->flags & XE_BO_FLAG_NEEDS_CPU_ACCESS)) {
266266
struct xe_tile *tile = xe_device_get_root_tile(xe);
267267

268268
/*
@@ -355,7 +355,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state)
355355
struct i915_vma *vma;
356356

357357
/* We reject creating !SCANOUT fb's, so this is weird.. */
358-
drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_SCANOUT_BIT));
358+
drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_FLAG_SCANOUT));
359359

360360
vma = __xe_pin_fb_vma(to_intel_framebuffer(fb), &plane_state->view.gtt);
361361
if (IS_ERR(vma))

‎drivers/gpu/drm/xe/display/xe_hdcp_gsc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ static int intel_hdcp_gsc_initialize_message(struct xe_device *xe,
7373
xe_device_mem_access_get(xe);
7474
bo = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, PAGE_SIZE * 2,
7575
ttm_bo_type_kernel,
76-
XE_BO_CREATE_SYSTEM_BIT |
77-
XE_BO_CREATE_GGTT_BIT);
76+
XE_BO_FLAG_SYSTEM |
77+
XE_BO_FLAG_GGTT);
7878

7979
if (IS_ERR(bo)) {
8080
drm_err(&xe->drm, "Failed to allocate bo for HDCP streaming command!\n");

‎drivers/gpu/drm/xe/display/xe_plane_initial.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ initial_plane_bo(struct xe_device *xe,
6262
if (plane_config->size == 0)
6363
return NULL;
6464

65-
flags = XE_BO_CREATE_PINNED_BIT | XE_BO_SCANOUT_BIT | XE_BO_CREATE_GGTT_BIT;
65+
flags = XE_BO_FLAG_PINNED | XE_BO_FLAG_SCANOUT | XE_BO_FLAG_GGTT;
6666

6767
base = round_down(plane_config->base, page_size);
6868
if (IS_DGFX(xe)) {
@@ -79,7 +79,7 @@ initial_plane_bo(struct xe_device *xe,
7979
}
8080

8181
phys_base = pte & ~(page_size - 1);
82-
flags |= XE_BO_CREATE_VRAM0_BIT;
82+
flags |= XE_BO_FLAG_VRAM0;
8383

8484
/*
8585
* We don't currently expect this to ever be placed in the
@@ -101,7 +101,7 @@ initial_plane_bo(struct xe_device *xe,
101101
if (!stolen)
102102
return NULL;
103103
phys_base = base;
104-
flags |= XE_BO_CREATE_STOLEN_BIT;
104+
flags |= XE_BO_FLAG_STOLEN;
105105

106106
/*
107107
* If the FB is too big, just don't use it since fbdev is not very

‎drivers/gpu/drm/xe/tests/xe_bo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static void ccs_test_run_tile(struct xe_device *xe, struct xe_tile *tile,
116116
int ret;
117117

118118
/* TODO: Sanity check */
119-
unsigned int bo_flags = XE_BO_CREATE_VRAM_IF_DGFX(tile);
119+
unsigned int bo_flags = XE_BO_FLAG_VRAM_IF_DGFX(tile);
120120

121121
if (IS_DGFX(xe))
122122
kunit_info(test, "Testing vram id %u\n", tile->id);
@@ -186,7 +186,7 @@ EXPORT_SYMBOL_IF_KUNIT(xe_ccs_migrate_kunit);
186186
static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struct kunit *test)
187187
{
188188
struct xe_bo *bo, *external;
189-
unsigned int bo_flags = XE_BO_CREATE_VRAM_IF_DGFX(tile);
189+
unsigned int bo_flags = XE_BO_FLAG_VRAM_IF_DGFX(tile);
190190
struct xe_vm *vm = xe_migrate_get_vm(xe_device_get_root_tile(xe)->migrate);
191191
struct xe_gt *__gt;
192192
int err, i, id;

‎drivers/gpu/drm/xe/tests/xe_dma_buf.c‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ static void check_residency(struct kunit *test, struct xe_bo *exported,
3636
xe_bo_assert_held(imported);
3737

3838
mem_type = XE_PL_VRAM0;
39-
if (!(params->mem_mask & XE_BO_CREATE_VRAM0_BIT))
39+
if (!(params->mem_mask & XE_BO_FLAG_VRAM0))
4040
/* No VRAM allowed */
4141
mem_type = XE_PL_TT;
4242
else if (params->force_different_devices && !p2p_enabled(params))
4343
/* No P2P */
4444
mem_type = XE_PL_TT;
4545
else if (params->force_different_devices && !is_dynamic(params) &&
46-
(params->mem_mask & XE_BO_CREATE_SYSTEM_BIT))
46+
(params->mem_mask & XE_BO_FLAG_SYSTEM))
4747
/* Pin migrated to TT */
4848
mem_type = XE_PL_TT;
4949

@@ -93,7 +93,7 @@ static void check_residency(struct kunit *test, struct xe_bo *exported,
9393
* possible, saving a migration step as the transfer is just
9494
* likely as fast from system memory.
9595
*/
96-
if (params->mem_mask & XE_BO_CREATE_SYSTEM_BIT)
96+
if (params->mem_mask & XE_BO_FLAG_SYSTEM)
9797
KUNIT_EXPECT_TRUE(test, xe_bo_is_mem_type(exported, XE_PL_TT));
9898
else
9999
KUNIT_EXPECT_TRUE(test, xe_bo_is_mem_type(exported, mem_type));
@@ -115,11 +115,11 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe)
115115

116116
/* No VRAM on this device? */
117117
if (!ttm_manager_type(&xe->ttm, XE_PL_VRAM0) &&
118-
(params->mem_mask & XE_BO_CREATE_VRAM0_BIT))
118+
(params->mem_mask & XE_BO_FLAG_VRAM0))
119119
return;
120120

121121
size = PAGE_SIZE;
122-
if ((params->mem_mask & XE_BO_CREATE_VRAM0_BIT) &&
122+
if ((params->mem_mask & XE_BO_FLAG_VRAM0) &&
123123
xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K)
124124
size = SZ_64K;
125125

@@ -148,7 +148,7 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe)
148148
*/
149149
if (params->force_different_devices &&
150150
!p2p_enabled(params) &&
151-
!(params->mem_mask & XE_BO_CREATE_SYSTEM_BIT)) {
151+
!(params->mem_mask & XE_BO_FLAG_SYSTEM)) {
152152
KUNIT_FAIL(test,
153153
"xe_gem_prime_import() succeeded when it shouldn't have\n");
154154
} else {
@@ -161,7 +161,7 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe)
161161
/* Pinning in VRAM is not allowed. */
162162
if (!is_dynamic(params) &&
163163
params->force_different_devices &&
164-
!(params->mem_mask & XE_BO_CREATE_SYSTEM_BIT))
164+
!(params->mem_mask & XE_BO_FLAG_SYSTEM))
165165
KUNIT_EXPECT_EQ(test, err, -EINVAL);
166166
/* Otherwise only expect interrupts or success. */
167167
else if (err && err != -EINTR && err != -ERESTARTSYS)
@@ -180,7 +180,7 @@ static void xe_test_dmabuf_import_same_driver(struct xe_device *xe)
180180
PTR_ERR(import));
181181
} else if (!params->force_different_devices ||
182182
p2p_enabled(params) ||
183-
(params->mem_mask & XE_BO_CREATE_SYSTEM_BIT)) {
183+
(params->mem_mask & XE_BO_FLAG_SYSTEM)) {
184184
/* Shouldn't fail if we can reuse same bo, use p2p or use system */
185185
KUNIT_FAIL(test, "dynamic p2p attachment failed with err=%ld\n",
186186
PTR_ERR(import));
@@ -203,52 +203,52 @@ static const struct dma_buf_attach_ops nop2p_attach_ops = {
203203
* gem object.
204204
*/
205205
static const struct dma_buf_test_params test_params[] = {
206-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT,
206+
{.mem_mask = XE_BO_FLAG_VRAM0,
207207
.attach_ops = &xe_dma_buf_attach_ops},
208-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT,
208+
{.mem_mask = XE_BO_FLAG_VRAM0,
209209
.attach_ops = &xe_dma_buf_attach_ops,
210210
.force_different_devices = true},
211211

212-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT,
212+
{.mem_mask = XE_BO_FLAG_VRAM0,
213213
.attach_ops = &nop2p_attach_ops},
214-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT,
214+
{.mem_mask = XE_BO_FLAG_VRAM0,
215215
.attach_ops = &nop2p_attach_ops,
216216
.force_different_devices = true},
217217

218-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT},
219-
{.mem_mask = XE_BO_CREATE_VRAM0_BIT,
218+
{.mem_mask = XE_BO_FLAG_VRAM0},
219+
{.mem_mask = XE_BO_FLAG_VRAM0,
220220
.force_different_devices = true},
221221

222-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT,
222+
{.mem_mask = XE_BO_FLAG_SYSTEM,
223223
.attach_ops = &xe_dma_buf_attach_ops},
224-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT,
224+
{.mem_mask = XE_BO_FLAG_SYSTEM,
225225
.attach_ops = &xe_dma_buf_attach_ops,
226226
.force_different_devices = true},
227227

228-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT,
228+
{.mem_mask = XE_BO_FLAG_SYSTEM,
229229
.attach_ops = &nop2p_attach_ops},
230-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT,
230+
{.mem_mask = XE_BO_FLAG_SYSTEM,
231231
.attach_ops = &nop2p_attach_ops,
232232
.force_different_devices = true},
233233

234-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT},
235-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT,
234+
{.mem_mask = XE_BO_FLAG_SYSTEM},
235+
{.mem_mask = XE_BO_FLAG_SYSTEM,
236236
.force_different_devices = true},
237237

238-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT,
238+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0,
239239
.attach_ops = &xe_dma_buf_attach_ops},
240-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT,
240+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0,
241241
.attach_ops = &xe_dma_buf_attach_ops,
242242
.force_different_devices = true},
243243

244-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT,
244+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0,
245245
.attach_ops = &nop2p_attach_ops},
246-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT,
246+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0,
247247
.attach_ops = &nop2p_attach_ops,
248248
.force_different_devices = true},
249249

250-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT},
251-
{.mem_mask = XE_BO_CREATE_SYSTEM_BIT | XE_BO_CREATE_VRAM0_BIT,
250+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0},
251+
{.mem_mask = XE_BO_FLAG_SYSTEM | XE_BO_FLAG_VRAM0,
252252
.force_different_devices = true},
253253

254254
{}

‎drivers/gpu/drm/xe/tests/xe_migrate.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static void test_copy(struct xe_migrate *m, struct xe_bo *bo,
113113
bo->size,
114114
ttm_bo_type_kernel,
115115
region |
116-
XE_BO_NEEDS_CPU_ACCESS);
116+
XE_BO_FLAG_NEEDS_CPU_ACCESS);
117117
if (IS_ERR(remote)) {
118118
KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %li\n",
119119
str, PTR_ERR(remote));
@@ -191,7 +191,7 @@ static void test_copy(struct xe_migrate *m, struct xe_bo *bo,
191191
static void test_copy_sysmem(struct xe_migrate *m, struct xe_bo *bo,
192192
struct kunit *test)
193193
{
194-
test_copy(m, bo, test, XE_BO_CREATE_SYSTEM_BIT);
194+
test_copy(m, bo, test, XE_BO_FLAG_SYSTEM);
195195
}
196196

197197
static void test_copy_vram(struct xe_migrate *m, struct xe_bo *bo,
@@ -203,9 +203,9 @@ static void test_copy_vram(struct xe_migrate *m, struct xe_bo *bo,
203203
return;
204204

205205
if (bo->ttm.resource->mem_type == XE_PL_VRAM0)
206-
region = XE_BO_CREATE_VRAM1_BIT;
206+
region = XE_BO_FLAG_VRAM1;
207207
else
208-
region = XE_BO_CREATE_VRAM0_BIT;
208+
region = XE_BO_FLAG_VRAM0;
209209
test_copy(m, bo, test, region);
210210
}
211211

@@ -281,17 +281,17 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test)
281281

282282
big = xe_bo_create_pin_map(xe, tile, m->q->vm, SZ_4M,
283283
ttm_bo_type_kernel,
284-
XE_BO_CREATE_VRAM_IF_DGFX(tile) |
285-
XE_BO_CREATE_PINNED_BIT);
284+
XE_BO_FLAG_VRAM_IF_DGFX(tile) |
285+
XE_BO_FLAG_PINNED);
286286
if (IS_ERR(big)) {
287287
KUNIT_FAIL(test, "Failed to allocate bo: %li\n", PTR_ERR(big));
288288
goto vunmap;
289289
}
290290

291291
pt = xe_bo_create_pin_map(xe, tile, m->q->vm, XE_PAGE_SIZE,
292292
ttm_bo_type_kernel,
293-
XE_BO_CREATE_VRAM_IF_DGFX(tile) |
294-
XE_BO_CREATE_PINNED_BIT);
293+
XE_BO_FLAG_VRAM_IF_DGFX(tile) |
294+
XE_BO_FLAG_PINNED);
295295
if (IS_ERR(pt)) {
296296
KUNIT_FAIL(test, "Failed to allocate fake pt: %li\n",
297297
PTR_ERR(pt));
@@ -301,8 +301,8 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test)
301301
tiny = xe_bo_create_pin_map(xe, tile, m->q->vm,
302302
2 * SZ_4K,
303303
ttm_bo_type_kernel,
304-
XE_BO_CREATE_VRAM_IF_DGFX(tile) |
305-
XE_BO_CREATE_PINNED_BIT);
304+
XE_BO_FLAG_VRAM_IF_DGFX(tile) |
305+
XE_BO_FLAG_PINNED);
306306
if (IS_ERR(tiny)) {
307307
KUNIT_FAIL(test, "Failed to allocate fake pt: %li\n",
308308
PTR_ERR(pt));

0 commit comments

Comments
 (0)