xf86-video-intel: 3 commits - src/sna/sna_display.c src/sna/sna_driver.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue May 22 01:57:12 PDT 2012
src/sna/sna_display.c | 9 +++++----
src/sna/sna_driver.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 28c4fb0b70e098972af972d30a660d167a8973ad
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue May 22 09:49:53 2012 +0100
sna: Swallow disconnection event upon mode restoration
So that we can VT switch back to X even though the output configuration
has now changed.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index cacacdf..0c73c36 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -447,8 +447,10 @@ sna_crtc_apply(xf86CrtcPtr crtc)
xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
"failed to set mode: %s\n", strerror(-ret));
ret = FALSE;
- } else
- ret = sna_crtc->active = sna_crtc_is_bound(sna, crtc);
+ } else {
+ crtc->enabled = sna_crtc->active = sna_crtc_is_bound(sna, crtc);
+ ret = TRUE;
+ }
if (crtc->scrn->pScreen)
xf86_reload_cursors(crtc->scrn->pScreen);
commit b17c44c8d234cb2c651e88c7892bcd5b33139c1c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue May 22 09:43:51 2012 +0100
sna: Remove incorrect assertion for mode restoration
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index e302d70..cacacdf 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -683,8 +683,7 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (!bo)
return FALSE;
- /* recreate the fb in case the size has changed */
- assert(bo->delta == 0);
+ /* XXX recreate the fb in case the size has changed? */
sna_mode->fb_id = get_fb(sna, bo,
scrn->virtualX, scrn->virtualY);
if (sna_mode->fb_id == 0)
commit 49b7742999ee11b0c36754ea10bc5609ebe8c609
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue May 22 09:40:25 2012 +0100
sna: Force config restoration after VT switch
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index c213ff4..9ec3ecf 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -728,8 +728,8 @@ static void sna_leave_vt(int scrnIndex, int flags)
DBG(("%s\n", __FUNCTION__));
xf86RotateFreeShadow(scrn);
-
xf86_hide_cursors(scrn);
+ sna_mode_remove_fb(sna);
ret = drmDropMaster(sna->kgem.fd);
if (ret)
More information about the xorg-commit
mailing list