Merge branch 'drm-core-next' into drm-linus

Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c

1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 65ef011fa8ba..1b49fa055f4f 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -373,11 +373,9 @@ static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
                                         mutex_unlock(&dev->mode_config.mutex);
                                 }
                         }
-                        if (dpms_mode == DRM_MODE_DPMS_OFF) {
-                                mutex_lock(&dev->mode_config.mutex);
-                                crtc_funcs->dpms(crtc, dpms_mode);
-                                mutex_unlock(&dev->mode_config.mutex);
-                        }
+                        mutex_lock(&dev->mode_config.mutex);
+                        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+                        mutex_unlock(&dev->mode_config.mutex);
                 }
         }
 }
@@ -385,18 +383,23 @@ static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
 int drm_fb_helper_blank(int blank, struct fb_info *info)
 {
         switch (blank) {
+        /* Display: On; HSync: On, VSync: On */
         case FB_BLANK_UNBLANK:
                 drm_fb_helper_on(info);
                 break;
+        /* Display: Off; HSync: On, VSync: On */
         case FB_BLANK_NORMAL:
-                drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+                drm_fb_helper_off(info, DRM_MODE_DPMS_ON);
                 break;
+        /* Display: Off; HSync: Off, VSync: On */
         case FB_BLANK_HSYNC_SUSPEND:
                 drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
                 break;
+        /* Display: Off; HSync: On, VSync: Off */
         case FB_BLANK_VSYNC_SUSPEND:
                 drm_fb_helper_off(info, DRM_MODE_DPMS_SUSPEND);
                 break;
+        /* Display: Off; HSync: Off, VSync: Off */
         case FB_BLANK_POWERDOWN:
                 drm_fb_helper_off(info, DRM_MODE_DPMS_OFF);
                 break;
@@ -905,8 +908,13 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev,
 
         if (new_fb) {
                 info->var.pixclock = 0;
-                if (register_framebuffer(info) < 0)
+                ret = fb_alloc_cmap(&info->cmap, modeset->crtc->gamma_size, 0);
+                if (ret)
+                        return ret;
+                if (register_framebuffer(info) < 0) {
+                        fb_dealloc_cmap(&info->cmap);
                         return -EINVAL;
+                }
         } else {
                 drm_fb_helper_set_par(info);
         }
@@ -936,6 +944,7 @@ void drm_fb_helper_free(struct drm_fb_helper *helper)
                 unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
         }
         drm_fb_helper_crtc_free(helper);
+        fb_dealloc_cmap(&helper->fb->fbdev->cmap);
 }
 EXPORT_SYMBOL(drm_fb_helper_free);