Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-06-29 13:12:52 +01:00
parent 15a0761cad
commit eae5e1275c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/sna.h
View File

@ -261,7 +261,6 @@ struct sna {
ScreenBlockHandlerProcPtr BlockHandler;
ScreenWakeupHandlerProcPtr WakeupHandler;
CloseScreenProcPtr CloseScreen;
xf86ModeSetProc *ModeSet;
PicturePtr clear;
struct {

11
src/sna/sna_driver.c
View File

@ -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);