Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f425321 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Don't unconditionally try to deref aliasing ppgtt 



Since the beginning, the functions which try to properly reference the
aliasing PPGTT have deferences a potentially null aliasing_ppgtt member.
Since the accessors are meant to be global, this will not do.

Introduced originally in:
commit a70a3148
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Wed Jul 31 16:59:56 2013 -0700

    drm/i915: Make proper functions for VMs

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e178f705

drivers/gpu/drm/i915/i915_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -4975,7 +4975,8 @@ unsigned long i915_gem_obj_offset(struct drm_i915_gem_object *o, 
	struct drm_i915_private *dev_priv = o->base.dev->dev_private;

	struct i915_vma *vma;



	if (vm == &dev_priv->mm.aliasing_ppgtt->base)

	if (!dev_priv->mm.aliasing_ppgtt ||

	    vm == &dev_priv->mm.aliasing_ppgtt->base)

		vm = &dev_priv->gtt.base;



	BUG_ON(list_empty(&o->vma_list));
@@ -5016,7 +5017,8 @@ unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o, 
	struct drm_i915_private *dev_priv = o->base.dev->dev_private;

	struct i915_vma *vma;



	if (vm == &dev_priv->mm.aliasing_ppgtt->base)

	if (!dev_priv->mm.aliasing_ppgtt ||

	    vm == &dev_priv->mm.aliasing_ppgtt->base)

		vm = &dev_priv->gtt.base;



	BUG_ON(list_empty(&o->vma_list));