Commit 896ab1a5 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Fix up checks for aliasing ppgtt

A subsequent patch will no longer initialize the aliasing ppgtt if we
have full ppgtt enabled, since we simply don't need that any more.

Unfortunately a few places check for the aliasing ppgtt instead of
checking for ppgtt in general. Fix them up.

One special case are the gtt offset and size macros, which have some
code to remap the aliasing ppgtt to the global gtt. The aliasing ppgtt
is _not_ a logical address space, so passing that in as the vm is
plain and simple a bug. So just WARN about it and carry on - we have a
gracefully fall-through anyway if we can't find the vma.
Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6c5566a8
...@@ -842,8 +842,6 @@ static u32 *vmap_batch(struct drm_i915_gem_object *obj) ...@@ -842,8 +842,6 @@ static u32 *vmap_batch(struct drm_i915_gem_object *obj)
*/ */
bool i915_needs_cmd_parser(struct intel_engine_cs *ring) bool i915_needs_cmd_parser(struct intel_engine_cs *ring)
{ {
struct drm_i915_private *dev_priv = ring->dev->dev_private;
if (!ring->needs_cmd_parser) if (!ring->needs_cmd_parser)
return false; return false;
...@@ -852,7 +850,7 @@ bool i915_needs_cmd_parser(struct intel_engine_cs *ring) ...@@ -852,7 +850,7 @@ bool i915_needs_cmd_parser(struct intel_engine_cs *ring)
* disabled. That will cause all of the parser's PPGTT checks to * disabled. That will cause all of the parser's PPGTT checks to
* fail. For now, disable parsing when PPGTT is off. * fail. For now, disable parsing when PPGTT is off.
*/ */
if (!dev_priv->mm.aliasing_ppgtt) if (USES_PPGTT(ring->dev))
return false; return false;
return (i915.enable_cmd_parser == 1); return (i915.enable_cmd_parser == 1);
......
...@@ -999,7 +999,7 @@ static int i915_getparam(struct drm_device *dev, void *data, ...@@ -999,7 +999,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
value = HAS_WT(dev); value = HAS_WT(dev);
break; break;
case I915_PARAM_HAS_ALIASING_PPGTT: case I915_PARAM_HAS_ALIASING_PPGTT:
value = dev_priv->mm.aliasing_ppgtt || USES_FULL_PPGTT(dev); value = USES_PPGTT(dev);
break; break;
case I915_PARAM_HAS_WAIT_TIMEOUT: case I915_PARAM_HAS_WAIT_TIMEOUT:
value = 1; value = 1;
......
...@@ -5106,9 +5106,7 @@ unsigned long i915_gem_obj_offset(struct drm_i915_gem_object *o, ...@@ -5106,9 +5106,7 @@ unsigned long i915_gem_obj_offset(struct drm_i915_gem_object *o,
struct drm_i915_private *dev_priv = o->base.dev->dev_private; struct drm_i915_private *dev_priv = o->base.dev->dev_private;
struct i915_vma *vma; struct i915_vma *vma;
if (!dev_priv->mm.aliasing_ppgtt || WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base);
vm == &dev_priv->mm.aliasing_ppgtt->base)
vm = &dev_priv->gtt.base;
list_for_each_entry(vma, &o->vma_list, vma_link) { list_for_each_entry(vma, &o->vma_list, vma_link) {
if (vma->vm == vm) if (vma->vm == vm)
...@@ -5149,9 +5147,7 @@ unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o, ...@@ -5149,9 +5147,7 @@ unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o,
struct drm_i915_private *dev_priv = o->base.dev->dev_private; struct drm_i915_private *dev_priv = o->base.dev->dev_private;
struct i915_vma *vma; struct i915_vma *vma;
if (!dev_priv->mm.aliasing_ppgtt || WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base);
vm == &dev_priv->mm.aliasing_ppgtt->base)
vm = &dev_priv->gtt.base;
BUG_ON(list_empty(&o->vma_list)); BUG_ON(list_empty(&o->vma_list));
......
...@@ -2006,9 +2006,7 @@ gen8_ring_dispatch_execbuffer(struct intel_engine_cs *ring, ...@@ -2006,9 +2006,7 @@ gen8_ring_dispatch_execbuffer(struct intel_engine_cs *ring,
u64 offset, u32 len, u64 offset, u32 len,
unsigned flags) unsigned flags)
{ {
struct drm_i915_private *dev_priv = ring->dev->dev_private; bool ppgtt = USES_PPGTT(ring->dev) && !(flags & I915_DISPATCH_SECURE);
bool ppgtt = dev_priv->mm.aliasing_ppgtt != NULL &&
!(flags & I915_DISPATCH_SECURE);
int ret; int ret;
ret = intel_ring_begin(ring, 4); ret = intel_ring_begin(ring, 4);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment