Bug#420816: MergedFB broken in 'sid' ati driver

[Stephen Olander Waters]

Package: xserver-xorg-video-ati
Version: 6.6.3-2

The attached MergedFB configuration breaks with the latest sid Xorg. It
is fixed in 6.6.191. (However, 6.6.191 crashes with old-style dual head
-- fortunately MergedFB works though!).

Thank you,
-s

-------------- next part --------------
A non-text attachment was scrubbed...
Name: Xorg.0.log
Type: text/x-log
Size: 53164 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-driver-ati/attachments/20070424/5ebdf60e/Xorg.0-0001.bin
-------------- next part --------------
# XF86Config-4 (XFree86 X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the XF86Config-4 manual page.
# (Type "man XF86Config-4" at the shell prompt.)
#
# This file is automatically updated on xserver-xfree86 package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xfree86
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following commands as root:
#
#   cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom
#   md5sum /etc/X11/XF86Config-4 >/var/lib/xfree86/XF86Config-4.md5sum
#   dpkg-reconfigure xserver-xfree86

Section "ServerFlags"
	Option "AllowMouseOpenFail" "true"
EndSection

Section "Files"
	FontPath	"/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
	FontPath	"/usr/local/share/fonts/truetype"
	FontPath	"/usr/share/fonts/X11/100dpi/:unscaled"
	FontPath	"/usr/share/fonts/X11/Type1"
	FontPath	"/usr/share/fonts/X11/misc"
	FontPath	"/usr/share/fonts/X11/100dpi"
EndSection

Section "Module"
	Load	"bitmap"
	Load	"dbe"
	Load	"ddc"
	Load	"dri"
	Load	"extmod"
	Load	"fbdevhw"
	Load	"freetype"
	Load	"glx"
	Load	"int10"
	Load	"record"
	Load	"type1"
	Load	"vbe"
EndSection

Section "InputDevice"
	Identifier	"Generic Keyboard"
	Driver		"kbd"
	Option		"CoreKeyboard"
	Option		"XkbRules"	"xorg"
	Option		"XkbModel"	"pc104"
	Option		"XkbLayout"	"dvorak"
	Option		"XkbOptions"	"ctrl:swapcaps"
EndSection

Section "InputDevice"
	Identifier	"Configured Mouse"
	Driver		"mouse"
	Option		"CorePointer"
	Option		"Device"		"/dev/input/mice"
	Option		"Protocol"		"ImPS/2"
	Option		"Emulate3Buttons"	"true"
	Option		"ZAxisMapping"		"4 5"
EndSection

Section "Device"
	Identifier	"Video 1"
	Driver		"ati"
	BusID		"PCI:1:0:0"
	Option		"AGPMode" "1"
	Option		"AGPFastWrite" "true"
	Option		"EnablePageFlip" "false"

	Option		"MergedFB" "true"

#	Option		"MetaModes" "1024x768+1280x1024 1024x768-1280x1024"
#	Option		"MetaModes" "1280x1024-1024x768"
	Option		"MetaModes" "1024x768-1280x1024"

	Option		"CRT2HSync"	"30-80"
	Option		"CRT2VRefresh"	"56-75"

	Option		"CRT2Position" "LeftOf"

#	Option		"MergedNonRectangular" "true"
#	Option		"MergedXinerama" "false"
EndSection

Section "Monitor"
	Identifier	"SEC:5842"
	HorizSync	28-49
	VertRefresh	43-72
	Option		"DPMS"
EndSection

#Section "Monitor"
#	Identifier	"CRT"
#	HorizSync	30-80
#	VertRefresh	56-75
#	Option		"DPMS"
#EndSection

Section "Screen"
	Identifier	"Screen 1"
	Device		"Video 1"
	Monitor		"SEC:5842"
	DefaultDepth	24
	SubSection "Display"
		Depth		24
		Modes		"1280x1024" "1024x768" "800x600" "640x480"
#		Virtual		2304 1024
	EndSubSection
EndSection

Section "ServerLayout"
	Identifier	"Default Layout"
	Screen		"Screen 1"
	InputDevice	"Generic Keyboard"
	InputDevice	"Configured Mouse"
EndSection

Section "DRI"
	Mode	0666
EndSection