1 files changed, 17 insertions, 68 deletions

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 3144db9dc0f1..0c0c39bac23d 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -126,7 +126,7 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_
 
         WARN_ON(!mutex_is_locked(&fb_helper->dev->mode_config.mutex));
         if (fb_helper->connector_count + 1 > fb_helper->connector_info_alloc_count) {
-                temp = krealloc(fb_helper->connector_info, sizeof(struct drm_fb_helper_connector) * (fb_helper->connector_count + 1), GFP_KERNEL);
+                temp = krealloc(fb_helper->connector_info, sizeof(struct drm_fb_helper_connector *) * (fb_helper->connector_count + 1), GFP_KERNEL);
                 if (!temp)
                         return -ENOMEM;
 
@@ -171,60 +171,6 @@ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
 }
 EXPORT_SYMBOL(drm_fb_helper_remove_one_connector);
 
-static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper)
-{
-        struct drm_fb_helper_connector *fb_helper_conn;
-        int i;
-
-        for (i = 0; i < fb_helper->connector_count; i++) {
-                struct drm_cmdline_mode *mode;
-                struct drm_connector *connector;
-                char *option = NULL;
-
-                fb_helper_conn = fb_helper->connector_info[i];
-                connector = fb_helper_conn->connector;
-                mode = &fb_helper_conn->cmdline_mode;
-
-                /* do something on return - turn off connector maybe */
-                if (fb_get_options(connector->name, &option))
-                        continue;
-
-                if (drm_mode_parse_command_line_for_connector(option,
-                                                              connector,
-                                                              mode)) {
-                        if (mode->force) {
-                                const char *s;
-                                switch (mode->force) {
-                                case DRM_FORCE_OFF:
-                                        s = "OFF";
-                                        break;
-                                case DRM_FORCE_ON_DIGITAL:
-                                        s = "ON - dig";
-                                        break;
-                                default:
-                                case DRM_FORCE_ON:
-                                        s = "ON";
-                                        break;
-                                }
-
-                                DRM_INFO("forcing %s connector %s\n",
-                                         connector->name, s);
-                                connector->force = mode->force;
-                        }
-
-                        DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",
-                                      connector->name,
-                                      mode->xres, mode->yres,
-                                      mode->refresh_specified ? mode->refresh : 60,
-                                      mode->rb ? " reduced blanking" : "",
-                                      mode->margins ? " with margins" : "",
-                                      mode->interlace ?  " interlaced" : "");
-                }
-
-        }
-        return 0;
-}
-
 static void drm_fb_helper_save_lut_atomic(struct drm_crtc *crtc, struct drm_fb_helper *helper)
 {
         uint16_t *r_base, *g_base, *b_base;
@@ -345,10 +291,17 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 
         drm_warn_on_modeset_not_all_locked(dev);
 
-        list_for_each_entry(plane, &dev->mode_config.plane_list, head)
+        list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
                 if (plane->type != DRM_PLANE_TYPE_PRIMARY)
                         drm_plane_force_disable(plane);
 
+                if (dev->mode_config.rotation_property) {
+                        drm_mode_plane_set_obj_prop(plane,
+                                                    dev->mode_config.rotation_property,
+                                                    BIT(DRM_ROTATE_0));
+                }
+        }
+
         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;
@@ -419,11 +372,11 @@ static bool drm_fb_helper_force_kernel_mode(void)
                 if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                         continue;
 
-                /* NOTE: we use lockless flag below to avoid grabbing other
-                 * modeset locks.  So just trylock the underlying mutex
-                 * directly:
+                /*
+                 * NOTE: Use trylock mode to avoid deadlocks and sleeping in
+                 * panic context.
                  */
-                if (!mutex_trylock(&dev->mode_config.mutex)) {
+                if (__drm_modeset_lock_all(dev, true) != 0) {
                         error = true;
                         continue;
                 }
@@ -432,7 +385,7 @@ static bool drm_fb_helper_force_kernel_mode(void)
                 if (ret)
                         error = true;
 
-                mutex_unlock(&dev->mode_config.mutex);
+                drm_modeset_unlock_all(dev);
         }
         return error;
 }
@@ -1013,7 +966,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
                 struct drm_fb_helper_connector *fb_helper_conn = fb_helper->connector_info[i];
                 struct drm_cmdline_mode *cmdline_mode;
 
-                cmdline_mode = &fb_helper_conn->cmdline_mode;
+                cmdline_mode = &fb_helper_conn->connector->cmdline_mode;
 
                 if (cmdline_mode->bpp_specified) {
                         switch (cmdline_mode->bpp) {
@@ -1260,9 +1213,7 @@ EXPORT_SYMBOL(drm_has_preferred_mode);
 
 static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
 {
-        struct drm_cmdline_mode *cmdline_mode;
-        cmdline_mode = &fb_connector->cmdline_mode;
-        return cmdline_mode->specified;
+        return fb_connector->connector->cmdline_mode.specified;
 }
 
 struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,
@@ -1272,7 +1223,7 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
         struct drm_display_mode *mode = NULL;
         bool prefer_non_interlace;
 
-        cmdline_mode = &fb_helper_conn->cmdline_mode;
+        cmdline_mode = &fb_helper_conn->connector->cmdline_mode;
         if (cmdline_mode->specified == false)
                 return mode;
 
@@ -1657,8 +1608,6 @@ bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel)
         struct drm_device *dev = fb_helper->dev;
         int count = 0;
 
-        drm_fb_helper_parse_command_line(fb_helper);
-
         mutex_lock(&dev->mode_config.mutex);
         count = drm_fb_helper_probe_connector_modes(fb_helper,
                                                     dev->mode_config.max_width,