i915: init bo mm at driver init only when modeset=1

To avoid bo memory manager being inited twice, it will be called
at firstopen when modeset is not enabled.

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 98908a5..f5fe5ba 100644 (file)
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -353,16 +353,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 #endif
 #endif
 
-       /*
-        * Initialize the memory manager for local and AGP space
-        */
-       ret = drm_bo_driver_init(dev);
-       if (ret) {
-               DRM_ERROR("fail to init memory manager for local & AGP space\n");
-               goto out_rmmap;
-       }
-
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+               /*
+                * Initialize the memory manager for local and AGP space
+                */
+               ret = drm_bo_driver_init(dev);
+               if (ret) {
+                       DRM_ERROR("fail to init memory manager for "
+                                 "local & AGP space\n");
+                       goto out_rmmap;
+               }
+
                ret = i915_load_modeset_init(dev);
                if (ret < 0) {
                        DRM_ERROR("failed to init modeset\n");