From: Francisco Jerez Date: Wed, 7 Oct 2015 11:44:02 +0000 (+0300) Subject: drm/i915: Hook up ring workaround writes at context creation time on Gen6-7. X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1322 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f91fc6d2c1d98b3da7a8341ef5ec66ccf2916b9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Hook up ring workaround writes at context creation time on Gen6-7. intel_rcs_ctx_init() emits all workaround register writes on the list to the ring, in addition to calling i915_gem_render_state_init(). The workaround list is currently empty on Gen6-7 so this shouldn't cause any functional changes. Signed-off-by: Francisco Jerez Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 702d3a2d73b9..654ae991ea13 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2623,7 +2623,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) GEN8_RING_SEMAPHORE_INIT; } } else if (INTEL_INFO(dev)->gen >= 6) { - ring->init_context = i915_gem_render_state_init; + ring->init_context = intel_rcs_ctx_init; ring->add_request = gen6_add_request; ring->flush = gen7_render_ring_flush; if (INTEL_INFO(dev)->gen == 6)