[Intel-gfx] [PATCH] drm/i915: Gracefully handle obj not bound to GGTT in is_pin_display
Daniel Vetter
daniel at ffwll.ch
Thu Apr 3 11:34:50 CEST 2014
On Wed, Apr 02, 2014 at 07:21:01PM +0100, oscar.mateo at intel.com wrote:
> From: Oscar Mateo <oscar.mateo at intel.com>
>
> Otherwise, we do a NULL pointer dereference.
>
> I've seen this happen while handling an error in
> i915_gem_object_pin_to_display_plane():
>
> If i915_gem_object_set_cache_level() fails, we call is_pin_display() to
> handle the error. At this point, the object is still not pinned to GGTT
> and maybe not even bound, so we have to check before we dereference its
> GGTT vma.
>
> Issue: VIZ-3772
> Signed-off-by: Oscar Mateo <oscar.mateo at intel.com>
Have you looked into provoking this with an igt testcase? On a hunch a
busy load (to extend the race window) plus the usual interruptor trick to
jump out of wait_seqno calls should be able to make this go kaboom on
command. But I haven't analyzed the bug in detail.
Thanks, Daniel
> ---
> drivers/gpu/drm/i915/i915_gem.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index c70121d..1d161c7 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3619,6 +3619,10 @@ unlock:
>
> static bool is_pin_display(struct drm_i915_gem_object *obj)
> {
> + struct i915_vma *vma = i915_gem_obj_to_ggtt(obj);
> + if (!vma)
> + return false;
> +
> /* There are 3 sources that pin objects:
> * 1. The display engine (scanouts, sprites, cursors);
> * 2. Reservations for execbuffer;
> @@ -3630,7 +3634,7 @@ static bool is_pin_display(struct drm_i915_gem_object *obj)
> * subtracting the potential reference by the user, any pin_count
> * remains, it must be due to another use by the display engine.
> */
> - return i915_gem_obj_to_ggtt(obj)->pin_count - !!obj->user_pin_count;
> + return vma->pin_count - !!obj->user_pin_count;
> }
>
> /*
> --
> 1.9.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
More information about the Intel-gfx
mailing list