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

Do output detection before any crtc allocation. 

Some output detection requires a crtc for load detection, perform all of the
output detection before allocating any crtcs so that there will be a free
crtc for any load detection. Avoids losing TV detection when two monitors
are connected.
This commit is contained in:
Keith Packard 2006-12-01 10:06:29 -08:00
parent 7642da8278
commit ec30356d95
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/i830_driver.c
View File

@ -880,6 +880,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
#ifdef XF86DRI
unsigned long savedMMSize;
#endif
enum detect_status output_status[MAX_OUTPUTS];
if (pScrn->numEntities != 1)
return FALSE;
@ -1362,6 +1363,16 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
/* Perform the pipe assignment of outputs. This is a kludge until
* we have better configuration support in the generic RandR code
*/
for (i = 0; i < pI830->xf86_config.num_output; i++)
{
xf86OutputPtr output = pI830->xf86_config.output[i];
I830OutputPrivatePtr intel_output = output->driver_private;
xf86CrtcPtr crtc;
int p;
output_status[i] = (*output->funcs->detect) (output);
}
for (i = 0; i < pI830->xf86_config.num_output; i++)
{
xf86OutputPtr output = pI830->xf86_config.output[i];
@ -1371,6 +1382,9 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
output->crtc = NULL;
if (output_status[i] == OUTPUT_STATUS_DISCONNECTED)
continue;
switch (intel_output->type) {
case I830_OUTPUT_LVDS:
/* LVDS must live on pipe B for two-pipe devices */
@ -1381,23 +1395,19 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
case I830_OUTPUT_ANALOG:
case I830_OUTPUT_DVO:
case I830_OUTPUT_SDVO:
if ((*output->funcs->detect)(output) != OUTPUT_STATUS_DISCONNECTED)
for (p = 0; p < pI830->xf86_config.num_crtc; p++)
{
for (p = 0; p < pI830->xf86_config.num_crtc; p++)
crtc = pI830->xf86_config.crtc[p];
if (!i830PipeInUse(crtc))
{
crtc = pI830->xf86_config.crtc[p];
if (!i830PipeInUse(crtc))
{
output->crtc = crtc;
break;
}
output->crtc = crtc;
break;
}
}
break;
case I830_OUTPUT_TVOUT:
crtc = pI830->xf86_config.crtc[0];
if ((*output->funcs->detect)(output) != OUTPUT_STATUS_DISCONNECTED &&
!i830PipeInUse(crtc))
if (!i830PipeInUse(crtc))
{
output->crtc = crtc;
}