[Intel-gfx] [PATCH 19/22] drm/i915: error capture with no ggtt slot

Chris Wilson chris at chris-wilson.co.uk
Fri Sep 27 17:52:46 UTC 2019


Quoting Matthew Auld (2019-09-27 18:34:06)
> @@ -2692,13 +2693,15 @@ static int init_ggtt(struct i915_ggtt *ggtt)
>         if (ret)
>                 return ret;
>  
> -       /* Reserve a mappable slot for our lockless error capture */
> -       ret = drm_mm_insert_node_in_range(&ggtt->vm.mm, &ggtt->error_capture,
> -                                         PAGE_SIZE, 0, I915_COLOR_UNEVICTABLE,
> -                                         0, ggtt->mappable_end,
> -                                         DRM_MM_INSERT_LOW);
> -       if (ret)
> -               return ret;
> +       if (HAS_MAPPABLE_APERTURE(ggtt->vm.i915)) {

Uh. If only we had the answer to hand...

if (ggtt->mappable_end) {

Or make HAS_MAPPABLE_APERTURE take ggtt. Though I'd vote for less
shouting.
-Chris


More information about the Intel-gfx mailing list