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

[Timo Aaltonen]

BugLink: http://bugs.launchpad.net/bugs/1449401
Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>

---
 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