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

Dont allocate overlay registers in KMS mode.

This commit is contained in:
Kristian Høgsberg 2009-02-19 16:40:19 -05:00
parent 872aadc710
commit 96da26b681
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/i830_driver.c
View File

@ -3249,12 +3249,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
"needs 2D acceleration.\n");
pI830->XvEnabled = FALSE;
}
if (!OVERLAY_NOEXIST(pI830) && pI830->overlay_regs == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Disabling Xv because the overlay register buffer "
"allocation failed.\n");
pI830->XvEnabled = FALSE;
}
}
#endif

2
src/i830_memory.c
View File

@ -1473,7 +1473,7 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
/* Allocate overlay register space and optional XAA linear allocator
* space. The second head in zaphod mode will share the space.
*/
if (I830IsPrimary(pScrn))
if (I830IsPrimary(pScrn) && !pI830->use_drm_mode)
i830_allocate_overlay(pScrn);
#endif

7
src/i830_video.c
View File

@ -648,8 +648,13 @@ I830InitVideo(ScreenPtr pScreen)
}
#endif
if (num_adaptors)
if (num_adaptors) {
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Disabling Xv because no adaptors could be initialized.\n");
pI830->XvEnabled = FALSE;
}
#ifdef INTEL_XVMC
if (xvmc_status)