1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f2183b554cbc..850cf7d6578c 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -324,6 +324,7 @@ intel_fb_helper_crtc(struct drm_fb_helper *fb_helper, struct drm_crtc *crtc)
 static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                                     struct drm_fb_helper_crtc **crtcs,
                                     struct drm_display_mode **modes,
+                                    struct drm_fb_offset *offsets,
                                     bool *enabled, int width, int height)
 {
         struct drm_device *dev = fb_helper->dev;
@@ -332,6 +333,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
         bool fallback = true;
         int num_connectors_enabled = 0;
         int num_connectors_detected = 0;
+        uint64_t conn_configured = 0, mask;
+        int pass = 0;
 
         save_enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool),
                                GFP_KERNEL);
@@ -339,7 +342,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                 return false;
 
         memcpy(save_enabled, enabled, dev->mode_config.num_connector);
-
+        mask = (1 << fb_helper->connector_count) - 1;
+retry:
         for (i = 0; i < fb_helper->connector_count; i++) {
                 struct drm_fb_helper_connector *fb_conn;
                 struct drm_connector *connector;
@@ -349,12 +353,19 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                 fb_conn = fb_helper->connector_info[i];
                 connector = fb_conn->connector;
 
+                if (conn_configured & (1 << i))
+                        continue;
+
+                if (pass == 0 && !connector->has_tile)
+                        continue;
+
                 if (connector->status == connector_status_connected)
                         num_connectors_detected++;
 
                 if (!enabled[i]) {
                         DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
                                       connector->name);
+                        conn_configured |= (1 << i);
                         continue;
                 }
 
@@ -373,6 +384,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                         DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
                                       connector->name);
                         enabled[i] = false;
+                        conn_configured |= (1 << i);
                         continue;
                 }
 
@@ -400,8 +412,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
 
                 /* try for preferred next */
                 if (!modes[i]) {
-                        DRM_DEBUG_KMS("looking for preferred mode on connector %s\n",
-                                      connector->name);
+                        DRM_DEBUG_KMS("looking for preferred mode on connector %s %d\n",
+                                      connector->name, connector->has_tile);
                         modes[i] = drm_has_preferred_mode(fb_conn, width,
                                                           height);
                 }
@@ -444,6 +456,12 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                               modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
 
                 fallback = false;
+                conn_configured |= (1 << i);
+        }
+
+        if ((conn_configured & mask) != mask) {
+                pass++;
+                goto retry;
         }
 
         /*