Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30dfc73ac7b22b2874938305bf00a5ea6f6e8434..3094b0807b407f740f80b751d2398c5ba0ec7af4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15018,6 +15018,7 @@ void intel_modeset_gem_init(struct drm_device *dev)
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *c;
        struct drm_i915_gem_object *obj;
+       int ret;
 
        mutex_lock(&dev->struct_mutex);
        intel_init_gt_powersave(dev);
@@ -15042,16 +15043,18 @@ void intel_modeset_gem_init(struct drm_device *dev)
         * pinned & fenced.  When we do the allocation it's too early
         * for this.
         */
-       mutex_lock(&dev->struct_mutex);
        for_each_crtc(dev, c) {
                obj = intel_fb_obj(c->primary->fb);
                if (obj == NULL)
                        continue;
 
-               if (intel_pin_and_fence_fb_obj(c->primary,
-                                              c->primary->fb,
-                                              c->primary->state,
-                                              NULL)) {
+               mutex_lock(&dev->struct_mutex);
+               ret = intel_pin_and_fence_fb_obj(c->primary,
+                                                c->primary->fb,
+                                                c->primary->state,
+                                                NULL);
+               mutex_unlock(&dev->struct_mutex);
+               if (ret) {
                        DRM_ERROR("failed to pin boot fb on pipe %d\n",
                                  to_intel_crtc(c)->pipe);
                        drm_framebuffer_unreference(c->primary->fb);
@@ -15059,7 +15062,6 @@ void intel_modeset_gem_init(struct drm_device *dev)
                        update_state_fb(c->primary);
                }
        }
-       mutex_unlock(&dev->struct_mutex);
 
        intel_backlight_register(dev);
 }