kdrive/fbdev: RandR initialization sequence change

This commit is contained in:
Keith Packard 2001-06-05 16:49:31 +00:00
parent 7fcf46356b
commit a4ba10ba6f

View File

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.16 2001/05/29 21:55:41 keithp Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.17 2001/06/03 21:52:45 keithp Exp $ */
#include "fbdev.h" #include "fbdev.h"
@ -542,15 +542,18 @@ fbdevRandRSetConfig (ScreenPtr pScreen,
return TRUE; return TRUE;
} }
void Bool
fbdevRandRInit (ScreenPtr pScreen) fbdevRandRInit (ScreenPtr pScreen)
{ {
rrScrPriv(pScreen); rrScrPrivPtr pScrPriv;
if (!RRScreenInit (pScreen))
return FALSE;
if (!pScrPriv) pScrPriv = rrGetScrPriv(pScreen);
return;
pScrPriv->rrGetInfo = fbdevRandRGetInfo; pScrPriv->rrGetInfo = fbdevRandRGetInfo;
pScrPriv->rrSetConfig = fbdevRandRSetConfig; pScrPriv->rrSetConfig = fbdevRandRSetConfig;
return TRUE;
} }
#endif #endif
@ -579,7 +582,8 @@ fbdevInitScreen (ScreenPtr pScreen)
if (!scrpriv->pLayer) if (!scrpriv->pLayer)
return FALSE; return FALSE;
#ifdef RANDR #ifdef RANDR
fbdevRandRInit (pScreen); if (!fbdevRandRInit (pScreen))
return FALSE;
#endif #endif
return TRUE; return TRUE;
} }