xf86-video-intel: 2 commits - src/i830_driver.c
Alan Hourihane
alanh at kemper.freedesktop.org
Tue Jul 11 09:41:37 EEST 2006
src/i830_driver.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletion(-)
New commits:
diff-tree 8a44a7acfcadbba2410dca750afc9d32bc83706e (from parents)
Merge: 584b544987be5cf23dce29ddaf3130e59cfe6fa8 e7723a4e5725147d3bd9ba22c5a3314b0556e440
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Tue Jul 11 07:41:27 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
diff-tree 584b544987be5cf23dce29ddaf3130e59cfe6fa8 (from 5a1b68993f3a3a2e8dcd428a7118e29c36703cd6)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Tue Jul 11 07:40:40 2006 +0100
Add an additional check before rotating
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 80a46a4..e55e421 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -955,6 +955,8 @@ I830Set640x480(ScrnInfoPtr pScrn)
if (VBESetVBEMode(pI830->pVbe, m, NULL))
return TRUE;
+ ErrorF("Set640x480 failed1\n");
+
/* if the first failed, let's try the next - usually 800x600 */
m = 0x32;
switch (pScrn->depth) {
@@ -970,6 +972,8 @@ I830Set640x480(ScrnInfoPtr pScrn)
if (VBESetVBEMode(pI830->pVbe, m, NULL))
return TRUE;
+ ErrorF("Set640x480 failed2\n");
+
return FALSE;
}
@@ -5572,6 +5576,10 @@ I830BIOSEnterVT(int scrnIndex, int flags
pI830->leaving = FALSE;
+ /* Detect monitor change and switch to suitable mode */
+ if (!pI830->starting)
+ I830DetectMonitorChange(pScrn);
+
#if 1
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
@@ -5630,9 +5638,11 @@ I830BIOSEnterVT(int scrnIndex, int flags
ResetState(pScrn, FALSE);
SetHWOperatingState(pScrn);
+#if 0
/* Detect monitor change and switch to suitable mode */
if (!pI830->starting)
I830DetectMonitorChange(pScrn);
+#endif
if (!I830VESASetMode(pScrn, pScrn->currentMode))
return FALSE;
@@ -5718,7 +5728,7 @@ I830BIOSSwitchMode(int scrnIndex, Displa
* The extra WindowTable check detects a rotation at startup.
*/
if ( (!WindowTable[pScrn->scrnIndex] || pspix->devPrivate.ptr == NULL) &&
- !pI830->DGAactive ) {
+ !pI830->DGAactive && (pScrn->PointerMoved == I830PointerMoved) ) {
if (!I830Rotate(pScrn, mode))
ret = FALSE;
}
More information about the xorg-commit
mailing list