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

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

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

drivers/gpu/drm/i915/i915_gem_context.c

+0 −6
Original line number Diff line number Diff line
@@ -575,8 +575,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring, 
				      struct intel_context *from,

				      struct intel_context *to)

{

	struct drm_i915_private *dev_priv = ring->dev->dev_private;



	if (to->remap_slice)

		return false;
@@ -584,10 +582,6 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring, 
		if (from == to && !test_bit(ring->id,

				&to->ppgtt->pd_dirty_rings))

			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;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+0 −3
Original line number Diff line number Diff line
@@ -1251,9 +1251,6 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file, 
	if (ctx->ppgtt)

		WARN(ctx->ppgtt->pd_dirty_rings & (1<<ring->id),

			"%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_mask = I915_EXEC_CONSTANTS_MASK;