drm/i915: Don't save/restore RS when not used
Subsystems (2)
PATCH 1/1 drm/i915: Don't save/restore RS when not used
Cc Kenneth Graunke <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>
--- drivers/gpu/drm/i915/i915_gem_context.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +7 -5
@@ -588,6 +588,7 @@ mi_set_context(struct intel_ring_buffer *ring, struct i915_hw_context *new_context, u32 hw_flags) { +u32 flags = hw_flags |MI_MM_SPACE_GTT ;int ret;/* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB
@@ -601,6 +602,10 @@ mi_set_context(struct intel_ring_buffer *ring,return ret; } +/* These flags are for resource streamer on HSW+ */ +if (!IS_HASWELL (ring->dev) &&INTEL_INFO (ring->dev)->gen <8 ) + flags |= (MI_SAVE_EXT_STATE_EN |MI_RESTORE_EXT_STATE_EN ); + ret =intel_ring_begin (ring,6 );if (ret)return ret;
@@ -613,11 +618,8 @@ mi_set_context(struct intel_ring_buffer *ring,intel_ring_emit (ring,MI_NOOP );intel_ring_emit (ring,MI_SET_CONTEXT ); -intel_ring_emit (ring,i915_gem_obj_ggtt_offset (new_context->obj) | -MI_MM_SPACE_GTT | -MI_SAVE_EXT_STATE_EN | -MI_RESTORE_EXT_STATE_EN | - hw_flags); +intel_ring_emit (ring, +i915_gem_obj_ggtt_offset (new_context->obj) | flags);/* * w/a: MI_SET_CONTEXT must always be followed by MI_NOOP * WaMiSetContext_Hang:snb,ivb,vlv
Signature · 1 line
1.9.0