| Message ID | 1430559386-29487-1-git-send-email-tjaalton@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
On Sat, May 02, 2015 at 12:36:26PM +0300, Timo Aaltonen wrote: > BugLink: http://bugs.launchpad.net/bugs/1449401 > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > Ugh! This fix makes sense looking at the backport this is fixing and the original mainline commit. Also, the bug shows positive test feedback. Cheers, -- Luís > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 648256c..4076537 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2048,7 +2048,8 @@ int intel_init_render_ring_buffer(struct drm_device *dev) > > if (INTEL_INFO(dev)->gen >= 8) { > ring->init_context = gen8_init_workarounds; > - } else if (INTEL_INFO(dev)->gen >= 6) { > + } > + if (INTEL_INFO(dev)->gen >= 6) { > ring->add_request = gen6_add_request; > ring->flush = gen7_render_ring_flush; > if (INTEL_INFO(dev)->gen == 6) > -- > 2.1.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Applied to Utopic master.
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 648256c..4076537 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2048,7 +2048,8 @@ int intel_init_render_ring_buffer(struct drm_device *dev) if (INTEL_INFO(dev)->gen >= 8) { ring->init_context = gen8_init_workarounds; - } else if (INTEL_INFO(dev)->gen >= 6) { + } + if (INTEL_INFO(dev)->gen >= 6) { ring->add_request = gen6_add_request; ring->flush = gen7_render_ring_flush; if (INTEL_INFO(dev)->gen == 6)
BugLink: http://bugs.launchpad.net/bugs/1449401 Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)