2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 9da581452874..6915fb82d0b0 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -136,7 +136,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
         obj = kcalloc(1, sizeof(*obj), GFP_KERNEL);
 
         obj->dev = dev;
-        obj->filp = shmem_file_setup("drm mm object", size, 0);
+        obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(obj->filp)) {
                 kfree(obj);
                 return NULL;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6b1148fc2cbe..b36a5214d8df 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -311,7 +311,7 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
         if (dev_priv->panel_fixed_mode != NULL) {
                 struct drm_display_mode *mode;
 
-                mutex_unlock(&dev->mode_config.mutex);
+                mutex_lock(&dev->mode_config.mutex);
                 mode = drm_mode_duplicate(dev, dev_priv->panel_fixed_mode);
                 drm_mode_probed_add(connector, mode);
                 mutex_unlock(&dev->mode_config.mutex);