Skip to content

Commit bf4c27b

Browse files
mbrost05Thomas Hellström
authored andcommitted
drm/xe: Remove TEST_VM_ASYNC_OPS_ERROR
TEST_VM_ASYNC_OPS_ERROR is broken and unused. Remove for now and will pull back in a later time when it is used, fixed, and properly hidden behind a Kconfig option. Also fixup the supported flags value. Fixes: dd08ebf ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240206045010.2981051-1-matthew.brost@intel.com (cherry picked from commit d9890c0) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent 9e3fc1d commit bf4c27b

File tree

2 files changed

+1
-35
lines changed

2 files changed

+1
-35
lines changed

drivers/gpu/drm/xe/xe_vm.c

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#include "generated/xe_wa_oob.h"
3838
#include "xe_wa.h"
3939

40-
#define TEST_VM_ASYNC_OPS_ERROR
41-
4240
static struct drm_gem_object *xe_vm_obj(struct xe_vm *vm)
4341
{
4442
return vm->gpuvm.r_obj;
@@ -2062,7 +2060,6 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,
20622060
struct drm_gem_object *obj = bo ? &bo->ttm.base : NULL;
20632061
struct drm_gpuva_ops *ops;
20642062
struct drm_gpuva_op *__op;
2065-
struct xe_vma_op *op;
20662063
struct drm_gpuvm_bo *vm_bo;
20672064
int err;
20682065

@@ -2109,15 +2106,6 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,
21092106
if (IS_ERR(ops))
21102107
return ops;
21112108

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-
21212109
drm_gpuva_for_each_op(__op, ops) {
21222110
struct xe_vma_op *op = gpuva_op_to_vma_op(__op);
21232111

@@ -2560,13 +2548,6 @@ static int xe_vma_op_execute(struct xe_vm *vm, struct xe_vma_op *op)
25602548

25612549
lockdep_assert_held_write(&vm->lock);
25622550

2563-
#ifdef TEST_VM_ASYNC_OPS_ERROR
2564-
if (op->inject_error) {
2565-
op->inject_error = false;
2566-
return -ENOMEM;
2567-
}
2568-
#endif
2569-
25702551
switch (op->base.op) {
25712552
case DRM_GPUVA_OP_MAP:
25722553
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,
27262707
return 0;
27272708
}
27282709

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
27342710
#define SUPPORTED_FLAGS \
27352711
(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)
27392713
#define XE_64K_PAGE_MASK 0xffffull
27402714
#define ALL_DRM_XE_SYNCS_FLAGS (DRM_XE_SYNCS_FLAG_WAIT_FOR_OP)
27412715

drivers/gpu/drm/xe/xe_vm_types.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ struct xe_bo;
2121
struct xe_sync_entry;
2222
struct xe_vm;
2323

24-
#define TEST_VM_ASYNC_OPS_ERROR
25-
#define FORCE_ASYNC_OP_ERROR BIT(31)
26-
2724
#define XE_VMA_READ_ONLY DRM_GPUVA_USERBITS
2825
#define XE_VMA_DESTROYED (DRM_GPUVA_USERBITS << 1)
2926
#define XE_VMA_ATOMIC_PTE_BIT (DRM_GPUVA_USERBITS << 2)
@@ -360,11 +357,6 @@ struct xe_vma_op {
360357
/** @flags: operation flags */
361358
enum xe_vma_op_flags flags;
362359

363-
#ifdef TEST_VM_ASYNC_OPS_ERROR
364-
/** @inject_error: inject error to test async op error handling */
365-
bool inject_error;
366-
#endif
367-
368360
union {
369361
/** @map: VMA map operation specific data */
370362
struct xe_vma_op_map map;

0 commit comments

Comments
 (0)