xf86-video-intel: src/sna/sna_driver.c src/sna/sna.h

[Chris Wilson]

 src/sna/sna.h        |    1 -
 src/sna/sna_driver.c |   11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit eae5e1275cd11703de2bca67dacd1d57129b561a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 29 13:12:52 2012 +0100

    sna: Install the ModeSet handler as the base handler
    
    This way we can safely ignore it across server regen.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna.h b/src/sna/sna.h
index 54ff4d5..66ee6c0 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -261,7 +261,6 @@ struct sna {
 	ScreenBlockHandlerProcPtr BlockHandler;
 	ScreenWakeupHandlerProcPtr WakeupHandler;
 	CloseScreenProcPtr CloseScreen;
-	xf86ModeSetProc *ModeSet;
 
 	PicturePtr clear;
 	struct {
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3b3b93f..047b865 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -806,12 +806,6 @@ static void sna_mode_set(ScrnInfoPtr scrn)
 	struct sna *sna = to_sna(scrn);
 
 	DBG(("%s\n", __FUNCTION__));
-
-	if (sna->ModeSet) {
-		scrn->ModeSet = sna->ModeSet;
-		scrn->ModeSet(scrn);
-		scrn->ModeSet = sna_mode_set;
-	}
 	sna_mode_update(sna);
 }
 
@@ -933,9 +927,6 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 	screen->CloseScreen = sna_close_screen;
 	screen->CreateScreenResources = sna_create_screen_resources;
 
-	sna->ModeSet = scrn->ModeSet;
-	scrn->ModeSet = sna_mode_set;
-
 	if (!xf86CrtcScreenInit(screen))
 		return FALSE;
 
@@ -1137,6 +1128,8 @@ Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num)
 	scrn->ValidMode = sna_valid_mode;
 	scrn->PMEvent = sna_pm_event;
 
+	scrn->ModeSet = sna_mode_set;
+
 	xf86SetEntitySharable(scrn->entityList[0]);
 
 	entity = xf86GetEntityInfo(entity_num);