From a04b7ef5d79a7caee997218753b197a217654c50 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 11 May 2012 14:29:32 +0100
Subject: [PATCH] --- yaml --- r: 307455 b: refs/heads/master c:
 edc912f58eaec20fd3372d9b1dab33fc28b3b3fd h: refs/heads/master i:   307453:
 b7487a4d490983af68ea87585756f52934e9c5c6   307451:
 372acb0d806050d04768a5a2b7047f8069853269   307447:
 da49425754874ca6cbbeac04e380ac41cb95b41b   307439:
 29594137f9cd71c3add771a7ba500237dff587b1   307423:
 8fe08b96cf2458f6766e107ad523c5537d7426ca   307391:
 176b22ed3473be832db9653668431e984ccac288   307327:
 14448336dc317e1dd9196b9cb73f4add5665a4c4   307199:
 34b6bccf204df912c58382bf4947d07ae895238c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 40d10eb9a850..b155f99f6c87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a15817cf16081b140e105736c9a6a50af38540b3
+refs/heads/master: edc912f58eaec20fd3372d9b1dab33fc28b3b3fd
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 006ea473b57d..b0df2949c1b7 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -980,10 +980,10 @@ static int i915_getparam(struct drm_device *dev, void *data,
 		value = 1;
 		break;
 	case I915_PARAM_HAS_BSD:
-		value = HAS_BSD(dev);
+		value = intel_ring_initialized(&dev_priv->ring[VCS]);
 		break;
 	case I915_PARAM_HAS_BLT:
-		value = HAS_BLT(dev);
+		value = intel_ring_initialized(&dev_priv->ring[BCS]);
 		break;
 	case I915_PARAM_HAS_RELAXED_FENCING:
 		value = 1;