---

yaml --- r: 185526 b: refs/heads/master c: b397c83 h: refs/heads/master v: v3
git-mirror · Feb 16, 2010 · dfb9bf4 · dfb9bf4
1 parent 21d63d6
commit dfb9bf4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4804411691bdd7d8a57e942cbb502fd52a90074
+refs/heads/master: b397c836eff58cd9a43f7bd8b853a51b3ecc3420
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4794,7 +4794,8 @@ i915_gem_load(struct drm_device *dev)
 	spin_unlock(&shrink_list_lock);
 
 	/* Old X drivers will take 0-2 for front, back, depth buffers */
-	dev_priv->fence_reg_start = 3;
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		dev_priv->fence_reg_start = 3;
 
 	if (IS_I965G(dev) || IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
 		dev_priv->num_fence_regs = 16;