drm/i915: Vebox ringbuffer init

v2: Add set_seqno which didn't exist before rebase (Haihao)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9496fb5f2fe1..84d2aa21435a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4013,12 +4013,21 @@ static int i915_gem_init_rings(struct drm_device *dev)
                         goto cleanup_bsd_ring;
         }
 
+        if (HAS_VEBOX(dev)) {
+                ret = intel_init_vebox_ring_buffer(dev);
+                if (ret)
+                        goto cleanup_blt_ring;
+        }
+
+
         ret = i915_gem_set_seqno(dev, ((u32)~0 - 0x1000));
         if (ret)
-                goto cleanup_blt_ring;
+                goto cleanup_vebox_ring;
 
         return 0;
 
+cleanup_vebox_ring:
+        intel_cleanup_ring_buffer(&dev_priv->ring[VECS]);
 cleanup_blt_ring:
         intel_cleanup_ring_buffer(&dev_priv->ring[BCS]);
 cleanup_bsd_ring: