xorg: don't try to guess and configure resolution or hsync when KMS mode is enabled for xorg video driver

This commit is contained in:
Silvan Calarco 2011-07-22 19:09:11 +02:00
parent ffc8b1a50b
commit 96719bdd08

View File

@ -365,6 +365,11 @@ if [ "$CONFCREATED" = "1" ]; then
if [ -r /var/log/Xorg.5.log ]; then if [ -r /var/log/Xorg.5.log ]; then
if [ "`grep '\[KMS\] Kernel modesetting enabled' /var/log/Xorg.5.log`" ]; then
logmsg "$me" "info: "$"KMS enabled: assuming autodetect works for PANEL_SIZE and HSYNC_RANGE"
PANEL_SIZE_DETECTED="true"
HSYNC_RANGE_NOT_DETECTED=""
else
if [ "`grep 'hsync range of 28.00-33.00 kHz' /var/log/Xorg.5.log`" -o \ if [ "`grep 'hsync range of 28.00-33.00 kHz' /var/log/Xorg.5.log`" -o \
"`grep 'The EDID read for display device CRT-0 is invalid' /var/log/Xorg.5.log`" ]; then "`grep 'The EDID read for display device CRT-0 is invalid' /var/log/Xorg.5.log`" ]; then
# no values could be autodetected by DDC, so use a failsafe low value (30-49) # no values could be autodetected by DDC, so use a failsafe low value (30-49)
@ -402,6 +407,7 @@ if [ "$CONFCREATED" = "1" ]; then
[ "`grep 'EDID Version:' /var/log/Xorg.5.log`" ] && PANEL_SIZE_DETECTED="true" [ "`grep 'EDID Version:' /var/log/Xorg.5.log`" ] && PANEL_SIZE_DETECTED="true"
[ "$autoresvideo" ] && PANEL_SIZE_DETECTED="true" [ "$autoresvideo" ] && PANEL_SIZE_DETECTED="true"
fi
[ "$XORG_DETECT_SCREEN_SIZE" = off -o "$lowresvideo" ] && unset PANEL_SIZE_DETECTED [ "$XORG_DETECT_SCREEN_SIZE" = off -o "$lowresvideo" ] && unset PANEL_SIZE_DETECTED