[Openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_fp.c src/via_ums.c src/via_ums.h

[Kevin Brace]

 configure.ac  |    2 +-
 src/via_fp.c  |    6 ++++++
 src/via_ums.c |   13 +++++++++++++
 src/via_ums.h |    6 ++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 64da07d49b17500aba47f95bc0a64bec881184c5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 9 19:28:26 2018 -0700

    Version bumped to 0.6.175
    
    Special FP handling code for Samsung NC20 netbook was added.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index db5d5ee..f733f69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.174],
+        [0.6.175],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit dea3a2dcc57e7f98deae4d6b0517ed0ca4840a48
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 9 19:12:20 2018 -0700

    Fix for Samsung NC20 netbook
    
    Samsung NC20 netbook actually has the FP connected to VX800 chipset's
    LVDS2 (LVDS Channel 2) rather than the more logical LVDS1 (LVDS Channel
    1). The code previously assumed that computer device vendor connects FP
    to LVDS1 if only one FP is in use.
    
    Tested-by: sebastien <lacsebastien at gmail.com>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_fp.c b/src/via_fp.c
index 1e8716e..c536417 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -1407,6 +1407,12 @@ viaFPProbe(ScrnInfoPtr pScrn)
                 pVIADisplay->intFP2Presence = FALSE;
                 pVIADisplay->intFP2DIPort = VIA_DI_PORT_NONE;
 
+            } else if (pVIADisplay->isSamsungNC20) {
+                pVIADisplay->intFP1Presence = FALSE;
+                pVIADisplay->intFP1DIPort = VIA_DI_PORT_NONE;
+                pVIADisplay->intFP2Presence = TRUE;
+                pVIADisplay->intFP2DIPort = VIA_DI_PORT_LVDS2;
+
             /* 3C5.13[7:6] - Integrated LVDS / DVI Mode Select
              *               (DVP1D15-14 pin strapping)
              *               00: LVDS1 + LVDS2
diff --git a/src/via_ums.c b/src/via_ums.c
index b877c80..9b0e3d8 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -985,6 +985,19 @@ umsPreInit(ScrnInfoPtr pScrn)
         pVIADisplay->isQuantaIL1      = FALSE;
     }
 
+    /* Samsung NC20 netbook has its FP connected to LVDS2
+     * rather than the more logical LVDS1, hence, a special
+     * flag register is needed for properly controlling its
+     * FP. */
+    if ((pVia->Chipset == VIA_VX800) &&
+        (SUBVENDOR_ID(pVia->PciInfo) == 0x144d) &&
+        (SUBSYS_ID(pVia->PciInfo) == 0xc04e)) {
+
+        pVIADisplay->isSamsungNC20      = TRUE;
+    } else {
+        pVIADisplay->isSamsungNC20      = FALSE;
+    }
+
     /* Checking for OLPC XO-1.5. */
     if ((pVia->Chipset == VIA_VX855) &&
         (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
diff --git a/src/via_ums.h b/src/via_ums.h
index efcc5cc..14fb18e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -214,6 +214,12 @@ typedef struct _VIADISPLAY {
      * is needed for properly controlling its FP. */
     Bool                isQuantaIL1;
 
+    /* Samsung NC20 netbook has its FP connected to LVDS2
+     * rather than the more logical LVDS1, hence, a special
+     * flag register is needed for properly controlling its
+     * FP. */
+    Bool                isSamsungNC20;
+
     /* OLPC XO-1.5 */
     Bool                isOLPCXO15;