From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f172.google.com ([209.85.212.172]:33508 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312AbbJGOdd (ORCPT ); Wed, 7 Oct 2015 10:33:33 -0400 Received: by wiclk2 with SMTP id lk2so216580806wic.0 for ; Wed, 07 Oct 2015 07:33:31 -0700 (PDT) Date: Wed, 7 Oct 2015 16:36:25 +0200 From: Daniel Vetter To: Francisco Jerez Cc: Daniel Vetter , Intel Graphics Development , Dave Gordon , Thomas Daniel , stable@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH] drm/i915: Resurrect golden context on gen6/7 Message-ID: <20151007143625.GP3383@phenom.ffwll.local> References: <1443715610-14254-1-git-send-email-daniel.vetter@ffwll.ch> <87si5uin3c.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87si5uin3c.fsf@riseup.net> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Oct 01, 2015 at 07:13:11PM +0300, Francisco Jerez wrote: > Daniel Vetter writes: > > > In > > > > commit 8f0e2b9d95a88ca5d8349deef2375644faf184ae > > Author: Daniel Vetter > > Date: Tue Dec 2 16:19:07 2014 +0100 > > > > drm/i915: Move golden context init into ->init_context > > > > I've shuffled around per-ctx init code a bit for legacy contexts but > > accidentally dropped the render state init call on gen6/7. Resurrect > > it. > > > > Reported-by: Francisco Jerez > > Cc: Francisco Jerez > > Cc: Dave Gordon > > Cc: Thomas Daniel > > Cc: stable@vger.kernel.org > > Signed-off-by: Daniel Vetter > > I'm not terribly familiar with this code but the change looks sensible > to me, this patch is: > > Reviewed-by: Francisco Jerez Applied to dinq (without cc: stable) so I can pull in your other prep patches. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > > index 16a4eada60a1..53920f01f264 100644 > > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > > @@ -2637,6 +2637,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->add_request = gen6_add_request; > > ring->flush = gen7_render_ring_flush; > > if (INTEL_INFO(dev)->gen == 6) > > -- > > 2.5.1 -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch