drm/i915: duplicate desired mode for use by fbcon.

duplicate the mode into fbcon storage, so when we free modes later
we don't just lose this.

Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 14 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b32a51f2a91d..028f5b66e3d8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2310,6 +2310,8 @@ static void intel_crtc_destroy(struct drm_crtc *crtc)
 {
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
+        if (intel_crtc->mode_set.mode)
+                drm_mode_destroy(crtc->dev, intel_crtc->mode_set.mode);
         drm_crtc_cleanup(crtc);
         kfree(intel_crtc);
 }
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index cbd2ba828c72..0ecf6b76a401 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -674,8 +674,12 @@ static int intelfb_multi_fb_probe_crtc(struct drm_device *dev, struct drm_crtc *
         par->crtc_ids[0] = crtc->base.id;
 
         modeset->num_connectors = conn_count;
-        if (modeset->mode != modeset->crtc->desired_mode)
-                modeset->mode = modeset->crtc->desired_mode;
+        if (modeset->crtc->desired_mode) {
+                if (modeset->mode)
+                        drm_mode_destroy(dev, modeset->mode);
+                modeset->mode = drm_mode_duplicate(dev,
+                                                   modeset->crtc->desired_mode);
+        }
 
         par->crtc_count = 1;
 
@@ -824,8 +828,12 @@ static int intelfb_single_fb_probe(struct drm_device *dev)
                 par->crtc_ids[crtc_count++] = crtc->base.id;
 
                 modeset->num_connectors = conn_count;
-                if (modeset->mode != modeset->crtc->desired_mode)
-                        modeset->mode = modeset->crtc->desired_mode;
+                if (modeset->crtc->desired_mode) {
+                        if (modeset->mode)
+                                drm_mode_destroy(dev, modeset->mode);
+                        modeset->mode = drm_mode_duplicate(dev,
+                                                           modeset->crtc->desired_mode);
+                }
         }
         par->crtc_count = crtc_count;