diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-07 11:04:10 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-07 12:36:59 +0100 |
| commit | c410f0cd982cad8de440727b0ad7d9268b89a704 (patch) | |
| tree | 6df8907c2d7555fa398cb2ed229d37a9c151cbfa /src/sna/sna_driver.c | |
| parent | c38512e12e879ae8932528a9cac5ffbf4ea138c0 (diff) | |
sna: Set desired mode after rediscover during VT switch
When switching back to the VT, rerun the output discovery (if such an
event was pending) before we attempt to set the desired modes.
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index d57902e6..f1a30dcb 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -1093,9 +1093,6 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL) if (intel_get_master(scrn)) return FALSE; - if (!sna_set_desired_mode(sna)) - return FALSE; - if (sna->flags & SNA_REDISCOVER) { DBG(("%s: reporting deferred discover event\n", __FUNCTION__)); @@ -1110,7 +1107,7 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL) sna->flags &= ~SNA_REPROBE; } - return TRUE; + return sna_set_desired_mode(sna); } static Bool sna_switch_mode(SWITCH_MODE_ARGS_DECL) |