Commit 71b7e54f authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Don't look at pg_dirty_rings for aliasing ppgtt

We load the ppgtt ptes once per gpu reset/driver load/resume and
that's all that's needed. Note that this only blows up when we're
using the allocate_va_range funcs and not the special-purpose ones
used. With this change we can get rid of that duplication.
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 2ebef630
...@@ -575,8 +575,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring, ...@@ -575,8 +575,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring,
struct intel_context *from, struct intel_context *from,
struct intel_context *to) struct intel_context *to)
{ {
struct drm_i915_private *dev_priv = ring->dev->dev_private;
if (to->remap_slice) if (to->remap_slice)
return false; return false;
...@@ -584,10 +582,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring, ...@@ -584,10 +582,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring,
if (from == to && !test_bit(ring->id, if (from == to && !test_bit(ring->id,
&to->ppgtt->pd_dirty_rings)) &to->ppgtt->pd_dirty_rings))
return true; return true;
} else if (dev_priv->mm.aliasing_ppgtt) {
if (from == to && !test_bit(ring->id,
&dev_priv->mm.aliasing_ppgtt->pd_dirty_rings))
return true;
} }
return false; return false;
......
...@@ -1251,9 +1251,6 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file, ...@@ -1251,9 +1251,6 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file,
if (ctx->ppgtt) if (ctx->ppgtt)
WARN(ctx->ppgtt->pd_dirty_rings & (1<<ring->id), WARN(ctx->ppgtt->pd_dirty_rings & (1<<ring->id),
"%s didn't clear reload\n", ring->name); "%s didn't clear reload\n", ring->name);
else if (dev_priv->mm.aliasing_ppgtt)
WARN(dev_priv->mm.aliasing_ppgtt->pd_dirty_rings &
(1<<ring->id), "%s didn't clear reload\n", ring->name);
instp_mode = args->flags & I915_EXEC_CONSTANTS_MASK; instp_mode = args->flags & I915_EXEC_CONSTANTS_MASK;
instp_mask = I915_EXEC_CONSTANTS_MASK; instp_mask = I915_EXEC_CONSTANTS_MASK;
......
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