xf86-video-intel: 2 commits - src/i830_driver.c

[Alan Hourihane]

 src/i830_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree cdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba (from a94c96abf90c691faecbebf0c8d08f8010bc67ef)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Aug 16 17:16:28 2006 +0100

    Disable device check when mergedfb in operation.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 21adbaf..c0d9672 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -4398,7 +4398,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
    /*
     * Let's setup the mobile systems to check the lid status
     */
-   if (IS_MOBILE(pI830)) {
+   if (IS_MOBILE(pI830) && !pI830->MergedFB) {
       pI830->checkDevices = TRUE;
 
       if (!xf86ReturnOptValBool(pI830->Options, OPTION_CHECKDEVICES, TRUE)) {
diff-tree a94c96abf90c691faecbebf0c8d08f8010bc67ef (from 2a4e486d2990af433e915cfa26dc57cae02e01b7)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Aug 16 17:15:26 2006 +0100

    Fix bug #5150. Disable LVDS usage on i915G, i945G and i965G.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 5d5fb72..21adbaf 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2709,7 +2709,7 @@ SetDisplayDevices(ScrnInfoPtr pScrn, int
    } 
 
    /* LVDS doesn't exist on these */
-   if (IS_I830(pI830) || IS_845G(pI830) || IS_I865G(pI830))
+   if (IS_I830(pI830) || IS_845G(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I965G(pI830))
       singlepipe &= ~(PIPE_LFP | (PIPE_LFP<<8));
 
    if (pI830->availablePipes == 1)