diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2015-10-07 14:44:02 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-07 16:37:48 +0200 |
| commit | 4f91fc6d2c1d98b3da7a8341ef5ec66ccf2916b9 (patch) | |
| tree | 2cfd2529d25e3c7fdad3f324aca2400e90755c2d /drivers/gpu | |
| parent | 02235808b61cd9382d224b0df263193006dd9913 (diff) | |
| download | blackbird-obmc-linux-4f91fc6d2c1d98b3da7a8341ef5ec66ccf2916b9.tar.gz blackbird-obmc-linux-4f91fc6d2c1d98b3da7a8341ef5ec66ccf2916b9.zip | |
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 <currojerez@riseup.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |
