[PATCH] drm: update crtc x/y when only fb changes

[skeggsb]

From: Ben Skeggs <bske...@redhat.com>

Fixes:
        xrandr --output DVI-I-0 --right-of DVI-I-1
        xrandr --output DVI-I-0 --left-of DVI-I-1
        xrandr --output DVI-I-0 --right-of DVI-I-1

Signed-off-by: Ben Skeggs <bske...@redhat.com>
---
 drivers/gpu/drm/drm_crtc_helper.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc_helper.c 
b/drivers/gpu/drm/drm_crtc_helper.c
index ff447f1..810e867 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -869,13 +869,21 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                }
                drm_helper_disable_unused_functions(dev);
        } else if (fb_changed) {
+               int saved_x = set->crtc->x, saved_y = set->crtc->y;
+
+               set->crtc->x = set->x;
+               set->crtc->y = set->y;
+
                old_fb = set->crtc->fb;
                if (set->crtc->fb != set->fb)
                        set->crtc->fb = set->fb;
                ret = crtc_funcs->mode_set_base(set->crtc,
                                                set->x, set->y, old_fb);
-               if (ret != 0)
+               if (ret != 0) {
+                       set->crtc->x = saved_x;
+                       set->crtc->y = saved_y;
                        goto fail;
+               }
        }
 
        kfree(save_connectors);
-- 
1.6.4.3


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel