]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
drm/i915: Don't reserve compatibility fence regs in KMS mode.
authorEric Anholt <eric@anholt.net>
Tue, 26 Jan 2010 17:43:10 +0000 (09:43 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 16 Feb 2010 19:48:44 +0000 (11:48 -0800)
The fence start is for compatibility with UMS X Servers before fence
management.  KMS X Servers only started doing tiling after fence
management appeared.

Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_gem.c

index 129ac36ddc58437730eb540d63acd72a84a5e4c7..4a141993a37a2ff1bf883211f95f8fd28466af0d 100644 (file)
@@ -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;