Module Name: xsrc
Committed By: macallan
Date: Fri Jan 11 22:59:52 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_output.c
Log Message:
- 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
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.7 xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.8
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c:1.7 Sun Dec 30 06:46:48 2018
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c Fri Jan 11 22:59:52 2019
@@ -294,7 +294,7 @@ static R128MonitorType R128DisplayDDCCon
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 @@ void R128GetConnectorInfoFromBIOS(ScrnIn
/* 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);
