|
37 | 37 | #include "generated/xe_wa_oob.h"
|
38 | 38 | #include "xe_wa.h"
|
39 | 39 |
|
40 |
| -#define TEST_VM_ASYNC_OPS_ERROR |
41 |
| - |
42 | 40 | static struct drm_gem_object *xe_vm_obj(struct xe_vm *vm)
|
43 | 41 | {
|
44 | 42 | return vm->gpuvm.r_obj;
|
@@ -2062,7 +2060,6 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,
|
2062 | 2060 | struct drm_gem_object *obj = bo ? &bo->ttm.base : NULL;
|
2063 | 2061 | struct drm_gpuva_ops *ops;
|
2064 | 2062 | struct drm_gpuva_op *__op;
|
2065 |
| - struct xe_vma_op *op; |
2066 | 2063 | struct drm_gpuvm_bo *vm_bo;
|
2067 | 2064 | int err;
|
2068 | 2065 |
|
@@ -2109,15 +2106,6 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,
|
2109 | 2106 | if (IS_ERR(ops))
|
2110 | 2107 | return ops;
|
2111 | 2108 |
|
2112 |
| -#ifdef TEST_VM_ASYNC_OPS_ERROR |
2113 |
| - if (operation & FORCE_ASYNC_OP_ERROR) { |
2114 |
| - op = list_first_entry_or_null(&ops->list, struct xe_vma_op, |
2115 |
| - base.entry); |
2116 |
| - if (op) |
2117 |
| - op->inject_error = true; |
2118 |
| - } |
2119 |
| -#endif |
2120 |
| - |
2121 | 2109 | drm_gpuva_for_each_op(__op, ops) {
|
2122 | 2110 | struct xe_vma_op *op = gpuva_op_to_vma_op(__op);
|
2123 | 2111 |
|
@@ -2560,13 +2548,6 @@ static int xe_vma_op_execute(struct xe_vm *vm, struct xe_vma_op *op)
|
2560 | 2548 |
|
2561 | 2549 | lockdep_assert_held_write(&vm->lock);
|
2562 | 2550 |
|
2563 |
| -#ifdef TEST_VM_ASYNC_OPS_ERROR |
2564 |
| - if (op->inject_error) { |
2565 |
| - op->inject_error = false; |
2566 |
| - return -ENOMEM; |
2567 |
| - } |
2568 |
| -#endif |
2569 |
| - |
2570 | 2551 | switch (op->base.op) {
|
2571 | 2552 | case DRM_GPUVA_OP_MAP:
|
2572 | 2553 | ret = __xe_vma_op_execute(vm, op->map.vma, op);
|
@@ -2726,16 +2707,9 @@ static int vm_bind_ioctl_ops_execute(struct xe_vm *vm,
|
2726 | 2707 | return 0;
|
2727 | 2708 | }
|
2728 | 2709 |
|
2729 |
| -#ifdef TEST_VM_ASYNC_OPS_ERROR |
2730 |
| -#define SUPPORTED_FLAGS \ |
2731 |
| - (FORCE_ASYNC_OP_ERROR | DRM_XE_VM_BIND_FLAG_READONLY | \ |
2732 |
| - DRM_XE_VM_BIND_FLAG_IMMEDIATE | DRM_XE_VM_BIND_FLAG_NULL | 0xffff) |
2733 |
| -#else |
2734 | 2710 | #define SUPPORTED_FLAGS \
|
2735 | 2711 | (DRM_XE_VM_BIND_FLAG_READONLY | \
|
2736 |
| - DRM_XE_VM_BIND_FLAG_IMMEDIATE | DRM_XE_VM_BIND_FLAG_NULL | \ |
2737 |
| - 0xffff) |
2738 |
| -#endif |
| 2712 | + DRM_XE_VM_BIND_FLAG_IMMEDIATE | DRM_XE_VM_BIND_FLAG_NULL) |
2739 | 2713 | #define XE_64K_PAGE_MASK 0xffffull
|
2740 | 2714 | #define ALL_DRM_XE_SYNCS_FLAGS (DRM_XE_SYNCS_FLAG_WAIT_FOR_OP)
|
2741 | 2715 |
|
|
0 commit comments