| Message ID | 1444218245-8430-3-git-send-email-currojerez@riseup.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Oct 07, 2015 at 02:44:02PM +0300, Francisco Jerez wrote: > 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> Queued for -next, thanks for the patch. -Daniel > --- > This is based on top of Daniel's "drm/i915: Resurrect golden context > on gen6/7". [1] > > [1] https://patchwork.freedesktop.org/patch/60870/ > > drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 3373516..e2e40d0 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2703,7 +2703,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) > -- > 2.5.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 3373516..e2e40d0 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2703,7 +2703,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)
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> --- This is based on top of Daniel's "drm/i915: Resurrect golden context on gen6/7". [1] [1] https://patchwork.freedesktop.org/patch/60870/ drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)