* [PATCH] drm/i915: Resurrect golden context on gen6/7
@ 2015-10-01 16:06 Daniel Vetter
2015-10-01 16:13 ` Francisco Jerez
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2015-10-01 16:06 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Daniel Vetter, Francisco Jerez, Dave Gordon, Thomas Daniel,
stable, Daniel Vetter
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Resurrect golden context on gen6/7
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-07 14:36 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Francisco Jerez @ 2015-10-01 16:13 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development
Cc: Daniel Vetter, Dave Gordon, Thomas Daniel, stable, Daniel Vetter
[-- Attachment #1.1: Type: text/plain, Size: 1561 bytes --]
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>
> ---
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 212 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Resurrect golden context on gen6/7
2015-10-01 16:13 ` Francisco Jerez
@ 2015-10-07 14:36 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2015-10-07 14:36 UTC (permalink / raw)
To: Francisco Jerez
Cc: Daniel Vetter, Intel Graphics Development, Dave Gordon,
Thomas Daniel, stable, Daniel Vetter
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-07 14:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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-07 14:36 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).