Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-drm-fsl-dcu.git] / drivers / gpu / drm / i915 / intel_panel.c

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 5950888ae1d00bd7cf70ebb18d5595ee0ee8446e..a43c33bc4a3582ece3758ae7286b87fb2a8256ec 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -194,9 +194,6 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
            adjusted_mode->vdisplay == mode->vdisplay)
                goto out;
 
-       drm_mode_set_crtcinfo(adjusted_mode, 0);
-       pipe_config->timings_set = true;
-
        switch (fitting_mode) {
        case DRM_MODE_SCALE_CENTER:
                /*