kdrive: Remove dead slots from KdCardFuncs
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Adam Jackson
parent
c42311a9d7
commit
b7376fb933
|
|
@ -734,33 +734,6 @@ ephyrCreateResources(ScreenPtr pScreen)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
ephyrPreserve(KdCardInfo * card)
|
||||
{
|
||||
}
|
||||
|
||||
Bool
|
||||
ephyrEnable(ScreenPtr pScreen)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Bool
|
||||
ephyrDPMS(ScreenPtr pScreen, int mode)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
ephyrDisable(ScreenPtr pScreen)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ephyrRestore(KdCardInfo * card)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ephyrScreenFini(KdScreenInfo * screen)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -386,19 +386,10 @@ KdCardFuncs ephyrFuncs = {
|
|||
ephyrInitScreen, /* initScreen */
|
||||
ephyrFinishInitScreen, /* finishInitScreen */
|
||||
ephyrCreateResources, /* createRes */
|
||||
ephyrPreserve, /* preserve */
|
||||
ephyrEnable, /* enable */
|
||||
ephyrDPMS, /* dpms */
|
||||
ephyrDisable, /* disable */
|
||||
ephyrRestore, /* restore */
|
||||
ephyrScreenFini, /* scrfini */
|
||||
ephyrCardFini, /* cardfini */
|
||||
|
||||
0, /* initCursor */
|
||||
0, /* enableCursor */
|
||||
0, /* disableCursor */
|
||||
0, /* finiCursor */
|
||||
0, /* recolorCursor */
|
||||
|
||||
0, /* initAccel */
|
||||
0, /* enableAccel */
|
||||
|
|
|
|||
|
|
@ -72,10 +72,6 @@ KdSetColormap(ScreenPtr pScreen)
|
|||
(*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen,
|
||||
(1 << pScreenPriv->screen->fb.
|
||||
depth), defs);
|
||||
|
||||
/* recolor hardware cursor */
|
||||
if (pScreenPriv->card->cfuncs->recolorCursor)
|
||||
(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, 0, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -235,9 +231,4 @@ KdStoreColors(ColormapPtr pCmap, int ndef, xColorItem * pdefs)
|
|||
}
|
||||
|
||||
(*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, ndef, pdefs);
|
||||
|
||||
/* recolor hardware cursor */
|
||||
if (pScreenPriv->card->cfuncs->recolorCursor)
|
||||
(*pScreenPriv->card->cfuncs->recolorCursor) (pCmap->pScreen, ndef,
|
||||
pdefs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,14 +102,7 @@ KdDisableScreen(ScreenPtr pScreen)
|
|||
KdDisableColormap(pScreen);
|
||||
if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->disableAccel)
|
||||
(*pScreenPriv->card->cfuncs->disableAccel) (pScreen);
|
||||
if (!pScreenPriv->screen->softCursor &&
|
||||
pScreenPriv->card->cfuncs->disableCursor)
|
||||
(*pScreenPriv->card->cfuncs->disableCursor) (pScreen);
|
||||
if (pScreenPriv->card->cfuncs->dpms)
|
||||
(*pScreenPriv->card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
|
||||
pScreenPriv->enabled = FALSE;
|
||||
if (pScreenPriv->card->cfuncs->disable)
|
||||
(*pScreenPriv->card->cfuncs->disable) (pScreen);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -143,8 +136,6 @@ KdSuspend(void)
|
|||
for (screen = card->screenList; screen; screen = screen->next)
|
||||
if (screen->mynum == card->selected && screen->pScreen)
|
||||
KdDisableScreen(screen->pScreen);
|
||||
if (card->driver && card->cfuncs->restore)
|
||||
(*card->cfuncs->restore) (card);
|
||||
}
|
||||
KdDisableInput();
|
||||
KdDoSwitchCmd("suspend");
|
||||
|
|
@ -165,21 +156,13 @@ KdEnableScreen(ScreenPtr pScreen)
|
|||
|
||||
if (pScreenPriv->enabled)
|
||||
return TRUE;
|
||||
if (pScreenPriv->card->cfuncs->enable)
|
||||
if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))
|
||||
return FALSE;
|
||||
pScreenPriv->enabled = TRUE;
|
||||
pScreenPriv->dpmsState = KD_DPMS_NORMAL;
|
||||
pScreenPriv->card->selected = pScreenPriv->screen->mynum;
|
||||
if (!pScreenPriv->screen->softCursor &&
|
||||
pScreenPriv->card->cfuncs->enableCursor)
|
||||
(*pScreenPriv->card->cfuncs->enableCursor) (pScreen);
|
||||
if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->enableAccel)
|
||||
(*pScreenPriv->card->cfuncs->enableAccel) (pScreen);
|
||||
KdEnableColormap(pScreen);
|
||||
SetRootClip(pScreen, ROOT_CLIP_FULL);
|
||||
if (pScreenPriv->card->cfuncs->dpms)
|
||||
(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -598,26 +581,12 @@ KdCloseScreen(ScreenPtr pScreen)
|
|||
else
|
||||
ret = TRUE;
|
||||
|
||||
if (pScreenPriv->dpmsState != KD_DPMS_NORMAL)
|
||||
(*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
|
||||
|
||||
if (screen->mynum == card->selected)
|
||||
KdDisableScreen(pScreen);
|
||||
|
||||
/*
|
||||
* Restore video hardware when last screen is closed
|
||||
*/
|
||||
if (screen == card->screenList) {
|
||||
if (kdEnabled && card->cfuncs->restore)
|
||||
(*card->cfuncs->restore) (card);
|
||||
}
|
||||
|
||||
if (!pScreenPriv->screen->dumb && card->cfuncs->finiAccel)
|
||||
(*card->cfuncs->finiAccel) (pScreen);
|
||||
|
||||
if (!pScreenPriv->screen->softCursor && card->cfuncs->finiCursor)
|
||||
(*card->cfuncs->finiCursor) (pScreen);
|
||||
|
||||
if (card->cfuncs->scrfini)
|
||||
(*card->cfuncs->scrfini) (screen);
|
||||
|
||||
|
|
@ -645,34 +614,7 @@ KdCloseScreen(ScreenPtr pScreen)
|
|||
static Bool
|
||||
KdSaveScreen(ScreenPtr pScreen, int on)
|
||||
{
|
||||
KdScreenPriv(pScreen);
|
||||
int dpmsState;
|
||||
|
||||
if (!pScreenPriv->card->cfuncs->dpms)
|
||||
return FALSE;
|
||||
|
||||
dpmsState = pScreenPriv->dpmsState;
|
||||
switch (on) {
|
||||
case SCREEN_SAVER_OFF:
|
||||
dpmsState = KD_DPMS_NORMAL;
|
||||
break;
|
||||
case SCREEN_SAVER_ON:
|
||||
if (dpmsState == KD_DPMS_NORMAL)
|
||||
dpmsState = KD_DPMS_NORMAL + 1;
|
||||
break;
|
||||
case SCREEN_SAVER_CYCLE:
|
||||
if (dpmsState < KD_DPMS_MAX)
|
||||
dpmsState++;
|
||||
break;
|
||||
case SCREEN_SAVER_FORCER:
|
||||
break;
|
||||
}
|
||||
if (dpmsState != pScreenPriv->dpmsState) {
|
||||
if (pScreenPriv->enabled)
|
||||
(*pScreenPriv->card->cfuncs->dpms) (pScreen, dpmsState);
|
||||
pScreenPriv->dpmsState = dpmsState;
|
||||
}
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static Bool
|
||||
|
|
@ -886,14 +828,7 @@ KdScreenInit(ScreenPtr pScreen, int argc, char **argv)
|
|||
kdEnabled = TRUE;
|
||||
|
||||
if (screen->mynum == card->selected) {
|
||||
if (card->cfuncs->preserve)
|
||||
(*card->cfuncs->preserve) (card);
|
||||
if (card->cfuncs->enable)
|
||||
if (!(*card->cfuncs->enable) (pScreen))
|
||||
return FALSE;
|
||||
pScreenPriv->enabled = TRUE;
|
||||
if (!screen->softCursor && card->cfuncs->enableCursor)
|
||||
(*card->cfuncs->enableCursor) (pScreen);
|
||||
KdEnableColormap(pScreen);
|
||||
if (!screen->dumb && card->cfuncs->enableAccel)
|
||||
(*card->cfuncs->enableAccel) (pScreen);
|
||||
|
|
|
|||
|
|
@ -110,19 +110,10 @@ typedef struct _KdCardFuncs {
|
|||
Bool (*initScreen) (ScreenPtr); /* initialize ScreenRec */
|
||||
Bool (*finishInitScreen) (ScreenPtr pScreen);
|
||||
Bool (*createRes) (ScreenPtr); /* create screen resources */
|
||||
void (*preserve) (KdCardInfo *); /* save graphics card state */
|
||||
Bool (*enable) (ScreenPtr); /* set up for rendering */
|
||||
Bool (*dpms) (ScreenPtr, int); /* set DPMS screen saver */
|
||||
void (*disable) (ScreenPtr); /* turn off rendering */
|
||||
void (*restore) (KdCardInfo *); /* restore graphics card state */
|
||||
void (*scrfini) (KdScreenInfo *); /* close down screen */
|
||||
void (*cardfini) (KdCardInfo *); /* close down */
|
||||
|
||||
Bool (*initCursor) (ScreenPtr); /* detect and map cursor */
|
||||
void (*enableCursor) (ScreenPtr); /* enable cursor */
|
||||
void (*disableCursor) (ScreenPtr); /* disable cursor */
|
||||
void (*finiCursor) (ScreenPtr); /* close down */
|
||||
void (*recolorCursor) (ScreenPtr, int, xColorItem *);
|
||||
|
||||
Bool (*initAccel) (ScreenPtr);
|
||||
void (*enableAccel) (ScreenPtr);
|
||||
|
|
|
|||
Loading…
Reference in New Issue