xf86-video-intel: tools/virtual.c

[Chris Wilson]

 tools/virtual.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a55bbe3b598616ef4464e50cb9364c8cdf0b513a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 14 15:47:20 2014 +0000

    intel-virtual-output: Disable panning before setting mode on CRTC
    
    For whatever reason, presumably to do with the switch between CRTCs, we
    need to disable the panning before setting the mode in order for our
    desired CRTC position to take effect.
    
    Reported-by: Jeff Katz <bugzilla at kraln.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76146
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 9e267be..cf38315 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -1252,6 +1252,10 @@ err:
 			     dst->x, dst->y, dst->mode.width, dst->mode.height,
 			     dst->rotation, (long)rr_crtc, dst->mode.id));
 
+			ret = XRRSetPanning(dst->dpy, res, rr_crtc, memset(&panning, 0, sizeof(panning)));
+			DBG(("%s-%s: XRRSetPanning %s\n", DisplayString(dst->dpy), dst->name, ret ? "failed" : "success"));
+			(void)ret;
+
 			ret = XRRSetCrtcConfig(dst->dpy, res, rr_crtc, CurrentTime,
 					       dst->x, dst->y, dst->mode.id, dst->rotation,
 					       &dst->rr_output, 1);
@@ -1259,10 +1263,6 @@ err:
 			if (ret)
 				goto err;
 
-			ret = XRRSetPanning(dst->dpy, res, rr_crtc, memset(&panning, 0, sizeof(panning)));
-			DBG(("%s-%s: XRRSetPanning %s\n", DisplayString(dst->dpy), dst->name, ret ? "failed" : "success"));
-			(void)ret;
-
 			if (EXTRA_DBG) {
 				XRRCrtcInfo *c;
 				XRRPanning *p;