drm/i915: export error state ref handling

[deliverable/linux.git] / drivers / gpu / drm / drm_fb_helper.c

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index b78cbe74dadfaa3b99a9e0a5781c89eec159dc46..3d13ca6e257f0f2c6bd366a49f8b7f3622e592dd 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -168,6 +168,9 @@ static void drm_fb_helper_save_lut_atomic(struct drm_crtc *crtc, struct drm_fb_h
        uint16_t *r_base, *g_base, *b_base;
        int i;
 
+       if (helper->funcs->gamma_get == NULL)
+               return;
+
        r_base = crtc->gamma_store;
        g_base = r_base + crtc->gamma_size;
        b_base = g_base + crtc->gamma_size;
@@ -284,13 +287,27 @@ EXPORT_SYMBOL(drm_fb_helper_debug_leave);
  */
 bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 {
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_plane *plane;
        bool error = false;
-       int i, ret;
+       int i;
+
+       drm_warn_on_modeset_not_all_locked(dev);
 
-       drm_warn_on_modeset_not_all_locked(fb_helper->dev);
+       list_for_each_entry(plane, &dev->mode_config.plane_list, head)
+               drm_plane_force_disable(plane);
 
        for (i = 0; i < fb_helper->crtc_count; i++) {
                struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
+               struct drm_crtc *crtc = mode_set->crtc;
+               int ret;
+
+               if (crtc->funcs->cursor_set) {
+                       ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
+                       if (ret)
+                               error = true;
+               }
+
                ret = drm_mode_set_config_internal(mode_set);
                if (ret)
                        error = true;
@@ -583,6 +600,14 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
                return 0;
        }
 
+       /*
+        * The driver really shouldn't advertise pseudo/directcolor
+        * visuals if it can't deal with the palette.
+        */
+       if (WARN_ON(!fb_helper->funcs->gamma_set ||
+                   !fb_helper->funcs->gamma_get))
+               return -EINVAL;
+
        pindex = regno;
 
        if (fb->bits_per_pixel == 16) {
@@ -626,12 +651,19 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
 {
        struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
        struct drm_crtc_helper_funcs *crtc_funcs;
        u16 *red, *green, *blue, *transp;
        struct drm_crtc *crtc;
        int i, j, rc = 0;
        int start;
 
+       drm_modeset_lock_all(dev);
+       if (!drm_fb_helper_is_bound(fb_helper)) {
+               drm_modeset_unlock_all(dev);
+               return -EBUSY;
+       }
+
        for (i = 0; i < fb_helper->crtc_count; i++) {
                crtc = fb_helper->crtc_info[i].mode_set.crtc;
                crtc_funcs = crtc->helper_private;
@@ -654,10 +686,13 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
 
                        rc = setcolreg(crtc, hred, hgreen, hblue, start++, info);
                        if (rc)
-                               return rc;
+                               goto out;
                }
-               crtc_funcs->load_lut(crtc);
+               if (crtc_funcs->load_lut)
+                       crtc_funcs->load_lut(crtc);
        }
+ out:
+       drm_modeset_unlock_all(dev);
        return rc;
 }
 EXPORT_SYMBOL(drm_fb_helper_setcmap);