diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-10-01 09:47:59 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2015-10-01 09:47:59 +0100 |
| commit | 096ddef22d6c57198a424eef00845dc7302b0cfe (patch) | |
| tree | f888990e20df351b1583bda855f4c8d274374491 /src/sna/sna_driver.c | |
| parent | 0d3e1d3b2e0d82261e367ebba5992c89c429b7c7 (diff) | |
sna: Indicate when we expect to call RRGetInfo during discovery
Continuing the udevless saga where we query for topology changes on
calls to RRGetInfo() and so where we cannot call RRGetInfo() ourselves
on discovering the changes (to facilitate hotplug). The next step is
explicitly prevent the recursive call.
References: https://bugs.freedesktop.org/show_bug.cgi?id=91929#c10
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_driver.c')
| -rw-r--r-- | src/sna/sna_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 539093e0..8cbabb09 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -780,7 +780,7 @@ sna_handle_uevents(int fd, void *closure) __FUNCTION__, sna->scrn->vtSema)); if (sna->scrn->vtSema) { - sna_mode_discover(sna); + sna_mode_discover(sna, true); sna_mode_check(sna); } else sna->flags |= SNA_REPROBE; @@ -893,7 +893,7 @@ sna_randr_getinfo(ScreenPtr screen, Rotation *rotations) DBG(("%s()\n", __FUNCTION__)); if (!sna_uevent_poll(sna)) - sna_mode_discover(sna); + sna_mode_discover(sna, false); return sna->mode.rrGetInfo(screen, rotations); } @@ -1222,7 +1222,7 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL) if (sna->flags & SNA_REPROBE) { DBG(("%s: reporting deferred hotplug event\n", __FUNCTION__)); - sna_mode_discover(sna); + sna_mode_discover(sna, true); } sna_set_desired_mode(sna); |