From 67a6a4bfd9cd1a861911e76096923bfc652189e2 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 2 Jul 2013 14:27:03 +0100 Subject: sna: Hook into crtc_notify rather than ModeSet ModeSet is called after updating each CRTC, unlike crtc_notify which is called after applying all changes. The last is what we need as if we are called too early we detect that the next CRTC doesn't match our expectations and so we disable it, right before applying the desired mode. References: https://bugs.freedesktop.org/show_bug.cgi?id=66494 Signed-off-by: Chris Wilson --- src/sna/sna_driver.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/sna/sna_driver.c') diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 7092edce..ca41e7e7 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -781,14 +781,6 @@ static Bool sna_late_close_screen(CLOSE_SCREEN_ARGS_DECL) return TRUE; } -static void sna_mode_set(ScrnInfoPtr scrn) -{ - struct sna *sna = to_sna(scrn); - - DBG(("%s\n", __FUNCTION__)); - sna_mode_update(sna); -} - static Bool sna_register_all_privates(void) { @@ -1129,10 +1121,6 @@ Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num) scrn->ValidMode = sna_valid_mode; scrn->PMEvent = sna_pm_event; -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) - scrn->ModeSet = sna_mode_set; -#endif - xf86SetEntitySharable(entity_num); xf86SetEntityInstanceForScreen(scrn, entity_num, xf86GetNumEntityInstances(entity_num)-1); -- cgit v1.2.3