ACK: [Utopic SRU][PATCH] Fix a broken backport causing boot failure on gen8 Intel

[Luis Henriques]

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 at 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 at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20150504/b6842587/attachment.sig>