diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-07 07:53:11 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-07 07:56:14 +0100 |
| commit | c5bad6daaaa60fa8970eaf4a1ce485cd4c72c2fd (patch) | |
| tree | 8a5f264ed0210d5c6f7b85eadfb4d2efe0989892 /tools | |
| parent | 632d3dfe215c38f2dd052625ea8ec34582dfafef (diff) | |
intel-virtual-output: Disable remote CRTC using the remote Display!
Reported-by: Kirill Müller <mail@kirill-mueller.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78293
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtual.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/virtual.c b/tools/virtual.c index a74b7ce2..d7929573 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -1157,8 +1157,9 @@ static int context_update(struct context *ctx) continue; DBG(("%s: disabling output '%s'\n", - DisplayString(dst->dpy), dst->name)); - if (disable_crtc(dpy, res, dst->rr_crtc)) { + DisplayString(display->dpy), dst->name)); + assert(clone->dst.display == display); + if (disable_crtc(display->dpy, res, dst->rr_crtc)) { dst->rr_crtc = 0; dst->mode.id = 0; } @@ -1182,8 +1183,9 @@ static int context_update(struct context *ctx) continue; DBG(("%s: disabling output '%s'\n", - DisplayString(dst->dpy), dst->name)); - if (disable_crtc(dpy, res, dst->rr_crtc)) { + DisplayString(display->dpy), dst->name)); + assert(clone->dst.display == display); + if (disable_crtc(display->dpy, res, dst->rr_crtc)) { dst->rr_crtc = 0; dst->mode.id = 0; } @@ -1205,7 +1207,7 @@ static int context_update(struct context *ctx) Status ret; DBG(("%s: copying configuration from %s (mode=%ld: %dx%d) to %s\n", - DisplayString(dst->dpy), + DisplayString(display->dpy), src->name, (long)src->mode.id, src->mode.width, src->mode.height, dst->name)); @@ -1213,8 +1215,9 @@ static int context_update(struct context *ctx) err: if (dst->rr_crtc) { DBG(("%s: disabling unused output '%s'\n", - DisplayString(dst->dpy), dst->name)); - if (disable_crtc(dpy, res, dst->rr_crtc)) { + DisplayString(display->dpy), dst->name)); + assert(clone->dst.display == display); + if (disable_crtc(display->dpy, res, dst->rr_crtc)) { dst->rr_crtc = 0; dst->mode.id = 0; } |