5 files changed, 26 insertions, 28 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2a4ed7ca8b4..0758c7802e6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -456,7 +456,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EBADF;
+                return -ENOENT;
         obj_priv = to_intel_bo(obj);
 
         /* Bounds check source.
@@ -919,7 +919,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EBADF;
+                return -ENOENT;
         obj_priv = to_intel_bo(obj);
 
         /* Bounds check destination.
@@ -1002,7 +1002,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EBADF;
+                return -ENOENT;
         obj_priv = to_intel_bo(obj);
 
         mutex_lock(&dev->struct_mutex);
@@ -1060,7 +1060,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL) {
                 mutex_unlock(&dev->struct_mutex);
-                return -EBADF;
+                return -ENOENT;
         }
 
 #if WATCH_BUF
@@ -1099,7 +1099,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EBADF;
+                return -ENOENT;
 
         offset = args->offset;
 
@@ -1373,7 +1373,7 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EBADF;
+                return -ENOENT;
 
         mutex_lock(&dev->struct_mutex);
 
@@ -3364,7 +3364,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                                                    reloc->target_handle);
                 if (target_obj == NULL) {
                         i915_gem_object_unpin(obj);
-                        return -EBADF;
+                        return -ENOENT;
                 }
                 target_obj_priv = to_intel_bo(target_obj);
 
@@ -3781,7 +3781,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                                    exec_list[i].handle, i);
                         /* prevent error path from reading uninitialized data */
                         args->buffer_count = i + 1;
-                        ret = -EBADF;
+                        ret = -ENOENT;
                         goto err;
                 }
 
@@ -3791,7 +3791,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                                    object_list[i]);
                         /* prevent error path from reading uninitialized data */
                         args->buffer_count = i + 1;
-                        ret = -EBADF;
+                        ret = -EINVAL;
                         goto err;
                 }
                 obj_priv->in_execbuffer = true;
@@ -4265,7 +4265,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
                 DRM_ERROR("Bad handle in i915_gem_pin_ioctl(): %d\n",
                           args->handle);
                 mutex_unlock(&dev->struct_mutex);
-                return -EBADF;
+                return -ENOENT;
         }
         obj_priv = to_intel_bo(obj);
 
@@ -4321,7 +4321,7 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
                 DRM_ERROR("Bad handle in i915_gem_unpin_ioctl(): %d\n",
                           args->handle);
                 mutex_unlock(&dev->struct_mutex);
-                return -EBADF;
+                return -ENOENT;
         }
 
         obj_priv = to_intel_bo(obj);
@@ -4355,7 +4355,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
         if (obj == NULL) {
                 DRM_ERROR("Bad handle in i915_gem_busy_ioctl(): %d\n",
                           args->handle);
-                return -EBADF;
+                return -ENOENT;
         }
 
         mutex_lock(&dev->struct_mutex);
@@ -4408,7 +4408,7 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
         if (obj == NULL) {
                 DRM_ERROR("Bad handle in i915_gem_madvise_ioctl(): %d\n",
                           args->handle);
-                return -EBADF;
+                return -ENOENT;
         }
 
         mutex_lock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 155719e4d16..710eca70b32 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -275,7 +275,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EINVAL;
+                return -ENOENT;
         obj_priv = to_intel_bo(obj);
 
         if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {
@@ -362,7 +362,7 @@ i915_gem_get_tiling(struct drm_device *dev, void *data,
 
         obj = drm_gem_object_lookup(dev, file_priv, args->handle);
         if (obj == NULL)
-                return -EINVAL;
+                return -ENOENT;
         obj_priv = to_intel_bo(obj);
 
         mutex_lock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 8fcc75c1aa2..d1bf92b9978 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -535,6 +535,7 @@ int intel_opregion_init(struct drm_device *dev, int resume)
 err_out:
         iounmap(opregion->header);
         opregion->header = NULL;
+        acpi_video_register();
         return err;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1e5e0d379fa..5ec10e02341 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4429,15 +4429,12 @@ void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
 }
 
 static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-                                 u16 *blue, uint32_t size)
+                                 u16 *blue, uint32_t start, uint32_t size)
 {
+        int end = (start + size > 256) ? 256 : start + size, i;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int i;
-
-        if (size != 256)
-                return;
 
-        for (i = 0; i < 256; i++) {
+        for (i = start; i < end; i++) {
                 intel_crtc->lut_r[i] = red[i] >> 8;
                 intel_crtc->lut_g[i] = green[i] >> 8;
                 intel_crtc->lut_b[i] = blue[i] >> 8;
@@ -5412,18 +5409,18 @@ intel_user_framebuffer_create(struct drm_device *dev,
 
         obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle);
         if (!obj)
-                return NULL;
+                return ERR_PTR(-ENOENT);
 
         intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
         if (!intel_fb)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         ret = intel_framebuffer_init(dev, intel_fb,
                                      mode_cmd, obj);
         if (ret) {
                 drm_gem_object_unreference_unlocked(obj);
                 kfree(intel_fb);
-                return NULL;
+                return ERR_PTR(ret);
         }
 
         return &intel_fb->base;
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 54acd8b534d..7bdc96256bf 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -121,7 +121,9 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
         info->par = ifbdev;
 
-        intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
+        ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
+        if (ret)
+                goto out_unpin;
 
         fb = &ifbdev->ifb.base;
 
@@ -130,7 +132,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
         strcpy(info->fix.id, "inteldrmfb");
 
-        info->flags = FBINFO_DEFAULT;
+        info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &intelfb_ops;
 
         /* setup aperture base/size for vesafb takeover */
@@ -148,8 +150,6 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
         info->fix.smem_start = dev->mode_config.fb_base + obj_priv->gtt_offset;
         info->fix.smem_len = size;
 
-        info->flags = FBINFO_DEFAULT;
-
         info->screen_base = ioremap_wc(dev->agp->base + obj_priv->gtt_offset,
                                        size);
         if (!info->screen_base) {