drm/i915: update pipe size at set_config time

This only affects the fastboot path as-is.  In that case, we simply need
to make sure that we update the pipe size at the first mode set.  Rather
than putting it off until we decide to flip (if indeed we do end up
flipping), update the pipe size as appropriate a bit earlier in the
set_config call.

This sets us up for better pipe tracking in later patches.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e9b579f..e183a26 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2931,8 +2931,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                return ret;
        }
 
-       intel_update_pipe_size(intel_crtc);
-
        dev_priv->display.update_primary_plane(crtc, fb, x, y);
 
        if (intel_crtc->active)
@@ -11342,6 +11340,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
        if (!config->mode_changed)
                kfree(pipe_config);
 
+       intel_update_pipe_size(to_intel_crtc(set->crtc));
+
        if (config->mode_changed) {
                ret = intel_set_mode_pipes(set->crtc, set->mode,
                                           set->x, set->y, set->fb, pipe_config,