drm/i915: correctly update crtc->x/y in set_base

While reworking the modeset sequence, this got lost in

commit 25c5b2665fe4cc5a93edd29b62e7c05c15dddd26
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sun Jul 8 22:08:04 2012 +0200

    drm/i915: implement new set_mode code flow

I've noticed this because some Xorg versions seem to set up a new mode
with every crtc at (0,0) and then pan to the right multi-monitor
setup. And since some hacks of mine added more calls to mode_set using
the stored crtc->x/y my multi-screen setup blew up.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
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 e061acdde45d94a3221e5715facd2c6aea60a8e5..5576b7c695ed92f9bc5dc7107bd2f1c0f5036e2e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2246,6 +2246,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 
        old_fb = crtc->fb;
        crtc->fb = fb;
+       crtc->x = x;
+       crtc->y = y;
 
        if (old_fb) {
                intel_wait_for_vblank(dev, intel_crtc->pipe);
@@ -7020,11 +7022,11 @@ bool intel_set_mode(struct drm_crtc *crtc,
                        dev_priv->display.crtc_disable(&intel_crtc->base);
        }
 
-       if (modeset_pipes) {
+       /* crtc->mode is already used by the ->mode_set callbacks, hence we need
+        * to set it here already despite that we pass it down the callchain.
+        */
+       if (modeset_pipes)
                crtc->mode = *mode;
-               crtc->x = x;
-               crtc->y = y;
-       }
 
        /* Only after disabling all output pipelines that will be changed can we
         * update the the output configuration. */