forked from Minki/linux
drm/i915/selftests: check for missing aperture
We may be missing support for the mappable aperture on some platforms. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20191029095856.25431-7-matthew.auld@intel.com
This commit is contained in:
parent
34a6baa2df
commit
e60f7bb7ea
@ -250,7 +250,12 @@ static bool always_valid(struct context *ctx)
|
||||
|
||||
static bool needs_fence_registers(struct context *ctx)
|
||||
{
|
||||
return !intel_gt_is_wedged(ctx->engine->gt);
|
||||
struct intel_gt *gt = ctx->engine->gt;
|
||||
|
||||
if (intel_gt_is_wedged(gt))
|
||||
return false;
|
||||
|
||||
return gt->ggtt->num_fences;
|
||||
}
|
||||
|
||||
static bool needs_mi_store_dword(struct context *ctx)
|
||||
|
@ -301,6 +301,9 @@ static int igt_partial_tiling(void *arg)
|
||||
int tiling;
|
||||
int err;
|
||||
|
||||
if (!i915_ggtt_has_aperture(&i915->ggtt))
|
||||
return 0;
|
||||
|
||||
/* We want to check the page mapping and fencing of a large object
|
||||
* mmapped through the GTT. The object we create is larger than can
|
||||
* possibly be mmaped as a whole, and so we must use partial GGTT vma.
|
||||
@ -431,6 +434,9 @@ static int igt_smoke_tiling(void *arg)
|
||||
IGT_TIMEOUT(end);
|
||||
int err;
|
||||
|
||||
if (!i915_ggtt_has_aperture(&i915->ggtt))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* igt_partial_tiling() does an exhastive check of partial tiling
|
||||
* chunking, but will undoubtably run out of time. Here, we do a
|
||||
|
@ -1149,8 +1149,12 @@ static int __igt_reset_evict_vma(struct intel_gt *gt,
|
||||
struct i915_request *rq;
|
||||
struct evict_vma arg;
|
||||
struct hang h;
|
||||
unsigned int pin_flags;
|
||||
int err;
|
||||
|
||||
if (!gt->ggtt->num_fences && flags & EXEC_OBJECT_NEEDS_FENCE)
|
||||
return 0;
|
||||
|
||||
if (!engine || !intel_engine_can_store_dword(engine))
|
||||
return 0;
|
||||
|
||||
@ -1186,10 +1190,12 @@ static int __igt_reset_evict_vma(struct intel_gt *gt,
|
||||
goto out_obj;
|
||||
}
|
||||
|
||||
err = i915_vma_pin(arg.vma, 0, 0,
|
||||
i915_vma_is_ggtt(arg.vma) ?
|
||||
PIN_GLOBAL | PIN_MAPPABLE :
|
||||
PIN_USER);
|
||||
pin_flags = i915_vma_is_ggtt(arg.vma) ? PIN_GLOBAL : PIN_USER;
|
||||
|
||||
if (flags & EXEC_OBJECT_NEEDS_FENCE)
|
||||
pin_flags |= PIN_MAPPABLE;
|
||||
|
||||
err = i915_vma_pin(arg.vma, 0, 0, pin_flags);
|
||||
if (err) {
|
||||
i915_request_add(rq);
|
||||
goto out_obj;
|
||||
|
@ -45,6 +45,10 @@ static void trash_stolen(struct drm_i915_private *i915)
|
||||
unsigned long page;
|
||||
u32 prng = 0x12345678;
|
||||
|
||||
/* XXX: fsck. needs some more thought... */
|
||||
if (!i915_ggtt_has_aperture(ggtt))
|
||||
return;
|
||||
|
||||
for (page = 0; page < size; page += PAGE_SIZE) {
|
||||
const dma_addr_t dma = i915->dsm.start + page;
|
||||
u32 __iomem *s;
|
||||
|
@ -1149,6 +1149,9 @@ static int igt_ggtt_page(void *arg)
|
||||
unsigned int *order, n;
|
||||
int err;
|
||||
|
||||
if (!i915_ggtt_has_aperture(ggtt))
|
||||
return 0;
|
||||
|
||||
obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
|
||||
if (IS_ERR(obj))
|
||||
return PTR_ERR(obj);
|
||||
|
Loading…
Reference in New Issue
Block a user