summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-06-11 04:21:53 (GMT)
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-11 04:24:42 (GMT)
commit0de58c88aba7ddd69b04f24ab5b2967c359aa69e (patch)
treeaecf258c9c9405a2cb0747f12c9ebe761f6b919a
parenta85d210b34506cb39e7f08d81d4586fe4448b47f (diff)
xfree86: move didLock assignment down to where the function pointer is valid.
crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so it's actually defined before we use it. Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2. Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/xfree86/modes/xf86Crtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 585f84d..51fe115 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -278,7 +278,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
adjusted_mode = xf86DuplicateMode(mode);
- didLock = crtc->funcs->lock (crtc);
saved_mode = crtc->mode;
saved_x = crtc->x;
@@ -308,6 +307,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
goto done;
}
+ didLock = crtc->funcs->lock (crtc);
/* Pass our mode to the outputs and the CRTC to give them a chance to
* adjust it according to limitations or output properties, and also
* a chance to reject the mode entirely.