Hi Daniel,
Could you install discover and send us the output of
discover --data-path=xfree86/server/device/driver display
*as root* ?
If it returns the right driver, then your problem during upgrade might
already have been fixed. If you also have a chance to try upgrading from
xfree86/sarge to xorg/etch, feel free to try again and let us know what
happens.
Brice