Attachment #248330 for bug #338330

Lines 548-555 psbDRIScreenInit(ScreenPtr pScreen) Link Here

(-)xserver-xorg-video-psb-0.31.0/src/psb_dri.c.loader (-2 lines)
548		548
549	PSB_DEBUG(pScrn->scrnIndex, 3, "psbDRIScreenInit\n");	549	PSB_DEBUG(pScrn->scrnIndex, 3, "psbDRIScreenInit\n");
550		550
551	xf86LoaderReqSymLists(driReqSymbols, NULL);
552
553	pPsb->pDRIInfo = NULL;	551	pPsb->pDRIInfo = NULL;
554		552
555	/*	553	/*




    if (!Initialised) {
	Initialised = TRUE;
	xf86AddDriver(&psb, Module, 0);
	LoaderRefSymLists(fbSymbols, ddcSymbols, shadowSymbols,
			  psbvgahwSymbols,
#ifdef XF86DRI
			  psbDRMSymbols, psbDRISymbols,
#endif
			  NULL);
	return (pointer) TRUE;
    }


    if (!xf86LoadSubModule(pScrn, "dri"))
	return FALSE;

    xf86LoaderReqSymLists(psbDRISymbols, psbDRMSymbols, NULL);
    return TRUE;
}



    pPsb->xpsb = TRUE;

    xf86LoaderReqSymLists(psbXpsbSymbols, NULL);
    return TRUE;
}
#endif

	if (!xf86LoadSubModule(pScrn, "exa"))
	    return FALSE;

	xf86LoaderReqSymLists(exaSymbols, NULL);
    }

    xf86DrvMsg(pScrn->scrnIndex, from, "Acceleration %sabled\n",

	if (!xf86LoadSubModule(pScrn, "shadow"))
	    return FALSE;

	xf86LoaderReqSymLists(shadowSymbols, NULL);
    }

    xf86DrvMsg(pScrn->scrnIndex, from, "Shadow framebuffer %sabled\n",


    if (!xf86LoadSubModule(pScrn, "vbe"))
	return FALSE;
    xf86LoaderReqSymLists(vbeSymbols, NULL);

    /*
     * Parse options and load required modules here.


    if (!xf86LoadSubModule(pScrn, "fb"))
	return (FALSE);
    xf86LoaderReqSymLists(fbSymbols, NULL);

    pScrn->chipset = "Intel GMA500";
    pScrn->monitor = pScrn->confScreen->monitor;


    if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw"))
	return FALSE;
    xf86LoaderReqSymLists(psbvgahwSymbols, NULL);

    if (!vgaHWGetHWRec(pDevice->pScrns[0]))
	return FALSE;

Return to bug 338330

Lines 329-340 psbSetup(pointer Module, pointer Options Link Here

(-)xserver-xorg-video-psb-0.31.0/src/psb_driver.c.loader (-13 lines)
329	if (!Initialised) {	329	if (!Initialised) {
330	Initialised = TRUE;	330	Initialised = TRUE;
331	xf86AddDriver(&psb, Module, 0);	331	xf86AddDriver(&psb, Module, 0);
332	LoaderRefSymLists(fbSymbols, ddcSymbols, shadowSymbols,
333	psbvgahwSymbols,
334	#ifdef XF86DRI
335	psbDRMSymbols, psbDRISymbols,
336	#endif
337	NULL);
338	return (pointer) TRUE;	332	return (pointer) TRUE;
339	}	333	}
340		334
Lines 639-645 psbPreInitDRI(ScrnInfoPtr pScrn) Link Here
639	if (!xf86LoadSubModule(pScrn, "dri"))	633	if (!xf86LoadSubModule(pScrn, "dri"))
640	return FALSE;	634	return FALSE;
641		635
642	xf86LoaderReqSymLists(psbDRISymbols, psbDRMSymbols, NULL);
643	return TRUE;	636	return TRUE;
644	}	637	}
645		638
Lines 660-666 psbPreInitXpsb(ScrnInfoPtr pScrn) Link Here
660		653
661	pPsb->xpsb = TRUE;	654	pPsb->xpsb = TRUE;
662		655
663	xf86LoaderReqSymLists(psbXpsbSymbols, NULL);
664	return TRUE;	656	return TRUE;
665	}	657	}
666	#endif	658	#endif
Lines 680-686 psbPreInitAccel(ScrnInfoPtr pScrn) Link Here
680	if (!xf86LoadSubModule(pScrn, "exa"))	672	if (!xf86LoadSubModule(pScrn, "exa"))
681	return FALSE;	673	return FALSE;
682		674
683	xf86LoaderReqSymLists(exaSymbols, NULL);
684	}	675	}
685		676
686	xf86DrvMsg(pScrn->scrnIndex, from, "Acceleration %sabled\n",	677	xf86DrvMsg(pScrn->scrnIndex, from, "Acceleration %sabled\n",
Lines 720-726 psbPreInitShadowFB(ScrnInfoPtr pScrn) Link Here
720	if (!xf86LoadSubModule(pScrn, "shadow"))	711	if (!xf86LoadSubModule(pScrn, "shadow"))
721	return FALSE;	712	return FALSE;
722		713
723	xf86LoaderReqSymLists(shadowSymbols, NULL);
724	}	714	}
725		715
726	xf86DrvMsg(pScrn->scrnIndex, from, "Shadow framebuffer %sabled\n",	716	xf86DrvMsg(pScrn->scrnIndex, from, "Shadow framebuffer %sabled\n",
Lines 854-860 psbPreInit(ScrnInfoPtr pScrn, int flags) Link Here
854		844
855	if (!xf86LoadSubModule(pScrn, "vbe"))	845	if (!xf86LoadSubModule(pScrn, "vbe"))
856	return FALSE;	846	return FALSE;
857	xf86LoaderReqSymLists(vbeSymbols, NULL);
858		847
859	/*	848	/*
860	* Parse options and load required modules here.	849	* Parse options and load required modules here.
Lines 874-880 psbPreInit(ScrnInfoPtr pScrn, int flags) Link Here
874		863
875	if (!xf86LoadSubModule(pScrn, "fb"))	864	if (!xf86LoadSubModule(pScrn, "fb"))
876	return (FALSE);	865	return (FALSE);
877	xf86LoaderReqSymLists(fbSymbols, NULL);
878		866
879	pScrn->chipset = "Intel GMA500";	867	pScrn->chipset = "Intel GMA500";
880	pScrn->monitor = pScrn->confScreen->monitor;	868	pScrn->monitor = pScrn->confScreen->monitor;
Lines 1033-1039 psbDeviceInit(PsbDevicePtr pDevice, int Link Here
1033		1021
1034	if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw"))	1022	if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw"))
1035	return FALSE;	1023	return FALSE;
1036	xf86LoaderReqSymLists(psbvgahwSymbols, NULL);
1037		1024
1038	if (!vgaHWGetHWRec(pDevice->pScrns[0]))	1025	if (!vgaHWGetHWRec(pDevice->pScrns[0]))
1039	return FALSE;	1026	return FALSE;