diff options
| author | Kirill Müller <kirill.mueller@ivt.baug.ethz.ch> | 2013-11-26 11:36:54 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-26 10:52:18 +0000 |
| commit | 80d1dee70ba3bdf38e0dd68a39380f4f3d9f22b5 (patch) | |
| tree | e093fb48c97611ba988420bb3d8e892545ea565d /tools | |
| parent | 36ac68bedd3b30d7bdf0f40b438b45a7c4dec9e5 (diff) | |
intel-virtual-output: mute spurious warnings
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72027
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtual.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/virtual.c b/tools/virtual.c index 3ee9cd0a..dd938a0e 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -355,7 +355,9 @@ static void context_enable_timer(struct context *ctx) if (ctx->timer_active) return; - read(ctx->timer, &count, sizeof(count)); + /* reset timer */ + count = read(ctx->timer, &count, sizeof(count)); + ctx->timer_active = 1; } @@ -752,6 +754,7 @@ static void init_image(struct clone *clone) ret = XInitImage(image); assert(ret); + (void)ret; } static int mode_height(const XRRModeInfo *mode, Rotation rotation) @@ -1159,13 +1162,17 @@ err: DisplayString(dst->dpy), dst->name, dst->x, dst->y, dst->mode.width, dst->mode.height, dst->rotation, (long)rr_crtc)); + ret = XRRSetCrtcConfig(dst->dpy, res, rr_crtc, CurrentTime, dst->x, dst->y, dst->mode.id, dst->rotation, &dst->rr_output, 1); DBG(("%s-%s: XRRSetCrtcConfig %s\n", DisplayString(dst->dpy), dst->name, ret ? "failed" : "success")); + 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")); + dst->rr_crtc = rr_crtc; + (void)ret; } XUngrabServer(display->dpy); |