All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Francisco Jerez <currojerez@riseup.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Resurrect golden context on gen6/7
Date: Wed, 7 Oct 2015 16:36:25 +0200	[thread overview]
Message-ID: <20151007143625.GP3383@phenom.ffwll.local> (raw)
In-Reply-To: <87si5uin3c.fsf@riseup.net>

On Thu, Oct 01, 2015 at 07:13:11PM +0300, Francisco Jerez wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> 
> > In
> >
> > commit 8f0e2b9d95a88ca5d8349deef2375644faf184ae
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 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 <currojerez@riseup.net>
> > Cc: Francisco Jerez <currojerez@riseup.net>
> > Cc: Dave Gordon <david.s.gordon@intel.com>
> > Cc: Thomas Daniel <thomas.daniel@intel.com>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> I'm not terribly familiar with this code but the change looks sensible
> to me, this patch is:
> 
> Reviewed-by: Francisco Jerez <currojerez@riseup.net>

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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch>
To: Francisco Jerez <currojerez@riseup.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Dave Gordon <david.s.gordon@intel.com>,
	Thomas Daniel <thomas.daniel@intel.com>,
	stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Resurrect golden context on gen6/7
Date: Wed, 7 Oct 2015 16:36:25 +0200	[thread overview]
Message-ID: <20151007143625.GP3383@phenom.ffwll.local> (raw)
In-Reply-To: <87si5uin3c.fsf@riseup.net>

On Thu, Oct 01, 2015 at 07:13:11PM +0300, Francisco Jerez wrote:
> Daniel Vetter <daniel.vetter@ffwll.ch> writes:
> 
> > In
> >
> > commit 8f0e2b9d95a88ca5d8349deef2375644faf184ae
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 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 <currojerez@riseup.net>
> > Cc: Francisco Jerez <currojerez@riseup.net>
> > Cc: Dave Gordon <david.s.gordon@intel.com>
> > Cc: Thomas Daniel <thomas.daniel@intel.com>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> I'm not terribly familiar with this code but the change looks sensible
> to me, this patch is:
> 
> Reviewed-by: Francisco Jerez <currojerez@riseup.net>

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

  reply	other threads:[~2015-10-07 14:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-01 16:06 [PATCH] drm/i915: Resurrect golden context on gen6/7 Daniel Vetter
2015-10-01 16:13 ` Francisco Jerez
2015-10-01 16:13   ` Francisco Jerez
2015-10-07 14:36   ` Daniel Vetter [this message]
2015-10-07 14:36     ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151007143625.GP3383@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=currojerez@riseup.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.