Daniel Vetter <daniel.vetter@xxxxxxxx> writes:
> It's already protected by the bkl^Wdev->struct_mutex. While at it
> realign some related code.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_gem_context.c | 16 ++++++++--------
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 ++---
> 2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 6b0962db2cf7..5a47eb5e3c5d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -578,11 +578,9 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring,
> if (to->remap_slice)
> return false;
>
> - if (to->ppgtt) {
> - if (from == to && !test_bit(ring->id,
> - &to->ppgtt->pd_dirty_rings))
> - return true;
> - }
> + if (to->ppgtt && from == to &&
> + !(intel_ring_flag(ring) & to->ppgtt->pd_dirty_rings))
> + return true;
>
> return false;
> }
> @@ -668,7 +666,7 @@ static int do_switch(struct intel_engine_cs *ring,
> goto unpin_out;
>
> /* Doing a PD load always reloads the page dirs */
> - clear_bit(ring->id, &to->ppgtt->pd_dirty_rings);
> + to->ppgtt->pd_dirty_rings &= ~intel_ring_flag(ring);
> }
>
> if (ring != &dev_priv->ring[RCS]) {
> @@ -696,12 +694,14 @@ static int do_switch(struct intel_engine_cs *ring,
> * space. This means we must enforce that a page table load
> * occur when this occurs. */
> } else if (to->ppgtt &&
> - test_and_clear_bit(ring->id, &to->ppgtt->pd_dirty_rings))
> + (intel_ring_flag(ring) & to->ppgtt->pd_dirty_rings)) {
> hw_flags |= MI_FORCE_RESTORE;
> + to->ppgtt->pd_dirty_rings &= ~intel_ring_flag(ring);
> + }
>
> /* We should never emit switch_mm more than once */
> WARN_ON(needs_pd_load_pre(ring, to) &&
> - needs_pd_load_post(ring, to, hw_flags));
> + needs_pd_load_post(ring, to, hw_flags));
>
> ret = mi_set_context(ring, to, hw_flags);
> if (ret)
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 1d5badf1b887..0b06c6de27de 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1247,9 +1247,8 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file,
> if (ret)
> goto error;
>
> - if (ctx->ppgtt)
> - WARN(ctx->ppgtt->pd_dirty_rings & (1<<ring->id),
> - "%s didn't clear reload\n", ring->name);
> + WARN(ctx->ppgtt && ctx->ppgtt->pd_dirty_rings & (1<<ring->id),
> + "%s didn't clear reload\n", ring->name);
>
> instp_mode = args->flags & I915_EXEC_CONSTANTS_MASK;
> instp_mask = I915_EXEC_CONSTANTS_MASK;
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
