[xsrc/trunk]: xsrc/external/mit/xf86-video-r128/dist/src - don't try to acces...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/f0b55599ddcc
branches:  trunk
changeset: 10091:f0b55599ddcc
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Jan 11 22:59:52 2019 +0000

description:
- don't try to access a nonexistant video BIOS
- don't blindly assume VGA output
- on mobility chips assume LVDS and VGA outputs if no other info is available
Now this works again on my Pismo

diffstat:

 external/mit/xf86-video-r128/dist/src/r128_output.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r c2900cf42217 -r f0b55599ddcc external/mit/xf86-video-r128/dist/src/r128_output.c
--- a/external/mit/xf86-video-r128/dist/src/r128_output.c       Fri Jan 11 02:34:53 2019 +0000
+++ b/external/mit/xf86-video-r128/dist/src/r128_output.c       Fri Jan 11 22:59:52 2019 +0000
@@ -294,7 +294,7 @@
     unsigned char *R128MMIO = info->MMIO;
     R128OutputPrivatePtr r128_output = output->driver_private;
 
-    R128MonitorType MonType = MT_CRT;
+    R128MonitorType MonType = MT_NONE;
     xf86MonPtr *MonInfo = &output->MonInfo;
     uint32_t mask1, mask2;
 
@@ -476,7 +476,14 @@
 
     /* non-x86 platform */
     if (!info->VBIOS) {
-        otypes[0] = OUTPUT_VGA;
+       if (info->isDFP) {
+           /* XXX assume LVDS on chips that can have them */ 
+            otypes[0] = OUTPUT_LVDS;
+            otypes[1] = OUTPUT_VGA;
+        } else {
+            otypes[0] = OUTPUT_VGA;
+        }
+        return;
     }
 
     bios_header = R128_BIOS16(0x48);