drm/i915: Implement GPU semaphores for inter-ring synchronisation on SNB

The bulk of the change is to convert the growing list of rings into an
array so that the relationship between the rings and the semaphore sync
registers can be easily computed.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 64844e2e9f86..413a040386a9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -487,11 +487,11 @@ int i915_reset(struct drm_device *dev, u8 flags)
                         !dev_priv->mm.suspended) {
                 dev_priv->mm.suspended = 0;
 
-                dev_priv->render_ring.init(&dev_priv->render_ring);
+                dev_priv->ring[RCS].init(&dev_priv->ring[RCS]);
                 if (HAS_BSD(dev))
-                    dev_priv->bsd_ring.init(&dev_priv->bsd_ring);
+                    dev_priv->ring[VCS].init(&dev_priv->ring[VCS]);
                 if (HAS_BLT(dev))
-                    dev_priv->blt_ring.init(&dev_priv->blt_ring);
+                    dev_priv->ring[BCS].init(&dev_priv->ring[BCS]);
 
                 mutex_unlock(&dev->struct_mutex);
                 drm_irq_uninstall(dev);