xf86-video-intel: 2 commits - src/i830_driver.c src/i830_video.c
Alan Hourihane
alanh at kemper.freedesktop.org
Fri Oct 13 14:54:05 EEST 2006
src/i830_driver.c | 6 +++++-
src/i830_video.c | 14 +++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
New commits:
diff-tree 8045a7a0af1b276cd7f46ce99d034fd5d503e67c (from 6596333b077a692c669f8cb4ae32e145f8da6731)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Fri Oct 13 12:53:53 2006 +0100
Fix bug #8553 & #8542 - suspend/resume regression from 1.5 driver
diff --git a/src/i830_driver.c b/src/i830_driver.c
index a69a9a3..3cee1c8 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -8041,7 +8041,11 @@ I830BIOSEnterVT(int scrnIndex, int flags
* the Video BIOS with our saved devices, and only when that fails,
* we'll warm boot it.
*/
- if (!I830Set640x480(pScrn)) {
+ /* Check Pipe conf registers or possibly HTOTAL/VTOTAL for 0x00000000)*/
+ CARD32 temp;
+ Bool set = I830Set640x480(pScrn);
+ temp = pI830->pipe ? INREG(PIPEBCONF) : INREG(PIPEACONF);
+ if (!set || !(temp & 0x80000000)) {
xf86Int10InfoPtr pInt;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff-tree 6596333b077a692c669f8cb4ae32e145f8da6731 (from c7a23908a0ef45b14b438f656a5f15582bfcbc1c)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Fri Oct 13 12:48:16 2006 +0100
Fix some warnings
diff --git a/src/i830_video.c b/src/i830_video.c
index 0eeaccb..78ad636 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1,4 +1,4 @@
-#define VIDEO_DEBUG 0
+#define VIDEO_DEBUG 1
/***************************************************************************
Copyright 2000 Intel Corporation. All Rights Reserved.
@@ -160,7 +160,7 @@ Edummy(const char *dummy, ...)
do { \
BEGIN_LP_RING(8); \
OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); \
- OUT_RING(MI_NOOP); \
+ OUT_RING(MI_NOOP); \
if (!*pI830->overlayOn) { \
OUT_RING(MI_NOOP); \
OUT_RING(MI_NOOP); \
@@ -188,7 +188,7 @@ Edummy(const char *dummy, ...)
int spin = 1000000; \
BEGIN_LP_RING(6); \
OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); \
- OUT_RING(MI_NOOP); \
+ OUT_RING(MI_NOOP); \
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_OFF); \
if (IS_I965G(pI830)) \
OUT_RING(pI830->OverlayMem->Start | OFC_UPDATE); \
@@ -881,9 +881,6 @@ I830StopVideo(ScrnInfoPtr pScrn, pointer
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
I830Ptr pI830 = I830PTR(pScrn);
- I830OverlayRegPtr overlay =
- (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start);
-
if (pPriv->textured)
return;
@@ -3267,8 +3264,6 @@ I830BlockHandler(int i,
ScrnInfoPtr pScrn = xf86Screens[i];
I830Ptr pI830 = I830PTR(pScrn);
I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
- I830OverlayRegPtr overlay =
- (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start);
pScreen->BlockHandler = pI830->BlockHandler;
@@ -3398,9 +3393,6 @@ I830StopSurface(XF86SurfacePtr surface)
if (pPriv->isOn) {
I830Ptr pI830 = I830PTR(pScrn);
- I830OverlayRegPtr overlay =
- (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start);
-
ErrorF("StopSurface\n");
I830ResetVideo(pScrn);
More information about the xorg-commit
mailing list